test

Composer control feature

.discourse-compatibility

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

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "eslint-config-discourse"
+}

.github/workflows/discourse-plugin.yml

@@ -0,0 +1,13 @@
+name: Discourse Plugin
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  ci:
+    uses: discourse/.github/.github/workflows/discourse-plugin.yml@v1

.github/workflows/plugin-metadata.yml

@@ -0,0 +1,44 @@
+name: Metadata
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout head repository
+        uses: actions/checkout@v2
+
+      - name: Store head version
+        run: |
+          sed -n -e 's/^.*version: /head_version=/p' plugin.rb >> $GITHUB_ENV
+
+      - name: Checkout base repository
+        uses: actions/checkout@v2
+        with:
+          ref: "${{ github.base_ref }}"
+
+      - name: Store base version
+        run: |
+          sed -n -e 's/^.*version: /base_version=/p' plugin.rb >> $GITHUB_ENV
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Install semver
+        run: npm install --include=dev
+
+      - name: Check version
+        uses: actions/github-script@v5
+        with:
+          script: |
+            const semver = require('semver');
+            const { head_version, base_version } = process.env;
+
+            if (semver.lte(head_version, base_version)) {
+              core.setFailed("Head version is equal to or lower than base version.");
+            }

.gitignore

@@ -1,2 +1,8 @@
 coverage/*
-!coverage/.last_run.json
+!coverage/.last_run.json
+gems/*
+.bundle/
+auto_generated
+.DS_Store
+node_modules/
+vendor/*

.prettierrc

@@ -0,0 +1 @@
+{}

.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_gem:
+  rubocop-discourse: default.yml
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false

.simplecov

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+plugin = "discourse-custom-wizard"
+
+SimpleCov.configure do
+  track_files "plugins/#{plugin}/**/*.rb"
+  add_filter { |src| !(src.filename =~ /(\/#{plugin}\/app\/|\/#{plugin}\/lib\/)/) }
+end

.template-lintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  plugins: ["ember-template-lint-plugin-discourse"],
+  extends: "discourse:recommended",
+};

COPYRIGHT.txt

@@ -1,4 +1,4 @@
-All code in this repository is Copyright 2018 by Angus McLeod.
+All code in this repository is Copyright 2023 by Angus McLeod.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+group :development do
+  gem 'rubocop-discourse'
+end

Gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    regexp_parser (2.6.0)
+    rexml (3.2.5)
+    rubocop (1.36.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.22.0)
+      parser (>= 3.1.1.0)
+    rubocop-discourse (3.0)
+      rubocop (>= 1.1.0)
+      rubocop-rspec (>= 2.0.0)
+    rubocop-rspec (2.13.2)
+      rubocop (~> 1.33)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rubocop-discourse
+
+BUNDLED WITH
+   2.2.16

README.md

@@ -1,3 +1,27 @@
-# discourse-custom-wizard
+# Discourse Custom Wizard Plugin
 
-See further: https://thepavilion.io/c/knowledge/discourse/custom-wizard/118
+The Custom Wizard Plugin lets you make forms for your Discourse forum. Better user onboarding, structured posting, data enrichment, automated actions and much more for your community.
+
+<img src="https://camo.githubusercontent.com/593432f1fc9658ffca104065668cc88fa21dffcd3002cb78ffd50c71f33a2523/68747470733a2f2f706176696c696f6e2d6173736574732e6e7963332e63646e2e6469676974616c6f6365616e7370616365732e636f6d2f706c7567696e732f77697a6172642d7265706f7369746f72792d62616e6e65722e706e67" alt="" data-canonical-src="https://pavilion-assets.nyc3.cdn.digitaloceanspaces.com/plugins/wizard-repository-banner.png" style="max-width: 100%;" width="400">
+
+👋 Looking to report an issue? We're managing issues for this plugin using our [bug report wizard](https://coop.pavilion.tech/w/bug-report).
+
+## Install
+
+If you're not sure how to install a plugin in Discourse, please follow the [plugin installation guide](https://meta.discourse.org/t/install-a-plugin/19157) or contact your Discourse hosting provider.
+
+## Documentation
+
+[Read the full documentation here](https://coop.pavilion.tech/c/82), or go directly to the relevant section
+
+- [Wizard Administration](https://coop.pavilion.tech/t/1602)
+- [Wizard Settings](https://coop.pavilion.tech/t/1614)
+- [Step Settings](https://coop.pavilion.tech/t/1735)
+- [Field Settings](https://coop.pavilion.tech/t/1580)
+- [Conditional Settings](https://coop.pavilion.tech/t/1673)
+- [Field Interpolation](https://coop.pavilion.tech/t/1557)
+- [Handling Dates and Times](https://coop.pavilion.tech/t/1708)
+
+## Support
+
+- [Report an issue](https://coop.pavilion.tech/w/bug-report)

SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+The security of Discourse plugins are premised on the security of [Discourse](https://github.com/discourse/discourse). Please first consider whether a security issue is best reported and handled by the Discourse team. You can view the Discourse security policy [here](https://github.com/discourse/discourse/security/policy).
+
+## Reporting a Vulnerability
+
+If you find a security vulnerability that is specific to this plugin, please report it to development@pavilion.tech. Security issues always take precedence over all other work. All commits specific to security are prefixed with SECURITY.

app/controllers/custom_wizard/admin/admin.rb

@@ -3,6 +3,13 @@ class CustomWizard::AdminController < ::Admin::AdminController
   before_action :ensure_admin
 
   def index
+    subcription = CustomWizard::Subscription.new
+    render_json_dump(
+      subscribed: subcription.subscribed?,
+      subscription_type: subcription.type,
+      subscription_attributes: CustomWizard::Subscription.attributes,
+      subscription_client_installed: CustomWizard::Subscription.client_installed?
+    )
   end
 
   private
@@ -14,7 +21,7 @@ class CustomWizard::AdminController < ::Admin::AdminController
   end
 
   def custom_field_list
-    serialize_data(CustomWizard::CustomField.list, CustomWizard::CustomFieldSerializer)
+    serialize_data(CustomWizard::CustomField.full_list, CustomWizard::CustomFieldSerializer)
   end
 
   def render_error(message)

app/controllers/custom_wizard/admin/api.rb

@@ -20,6 +20,10 @@ class CustomWizard::AdminApiController < CustomWizard::AdminController
       raise Discourse::InvalidParameters, "An API with that name already exists: '#{current.title || current.name}'"
     end
 
+    unless subscription.includes?(:api, :all)
+      raise Discourse::InvalidParameters, "Your subscription doesn't include API features."
+    end
+
     PluginStoreRow.transaction do
       CustomWizard::Api.set(api_params[:name], title: api_params[:title])
 
@@ -130,4 +134,8 @@ class CustomWizard::AdminApiController < CustomWizard::AdminController
 
     @auth_data ||= auth_data
   end
+
+  def subscription
+    @subscription ||= CustomWizard::Subscription.new
+  end
 end

app/controllers/custom_wizard/admin/custom_fields.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 class CustomWizard::AdminCustomFieldsController < CustomWizard::AdminController
   def index
-    render_json_dump(custom_field_list)
+    render_json_dump(
+      custom_fields: custom_field_list
+    )
   end
 
   def update

app/controllers/custom_wizard/admin/logs.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+class CustomWizard::AdminLogsController < CustomWizard::AdminController
+  before_action :find_wizard, except: [:index]
+
+  def index
+    render json: ActiveModel::ArraySerializer.new(
+      CustomWizard::Wizard.list(current_user),
+      each_serializer: CustomWizard::BasicWizardSerializer
+    )
+  end
+
+  def show
+    render_json_dump(
+      wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
+      logs: ActiveModel::ArraySerializer.new(
+        log_list.logs,
+        each_serializer: CustomWizard::LogSerializer
+      ),
+      total: log_list.total
+    )
+  end
+
+  protected
+
+  def log_list
+    @log_list ||= begin
+      list = CustomWizard::Log.list(params[:page].to_i, params[:limit].to_i, params[:wizard_id])
+
+      if list.logs.any? && (usernames = list.logs.map(&:username)).present?
+        user_map = User.where(username: usernames)
+          .reduce({}) do |result, user|
+            result[user.username] = user
+            result
+          end
+
+        list.logs.each do |log_item|
+          log_item.user = user_map[log_item.username]
+        end
+      end
+
+      list
+    end
+  end
+end

app/controllers/custom_wizard/admin/manager.rb

@@ -41,27 +41,28 @@ class CustomWizard::AdminManagerController < CustomWizard::AdminController
     end
 
     begin
-      template_json = JSON.parse file
+      template_json = JSON.parse(file)
     rescue JSON::ParserError
       return render_error(I18n.t('wizard.import.error.invalid_json'))
     end
 
     imported = []
     failures = []
+    templates = template_json.is_a?(Array) ? template_json : [template_json]
 
-    template_json.each do |json|
+    templates.each do |raw_template|
-      template = CustomWizard::Template.new(json)
+      template = CustomWizard::Template.new(raw_template)
       template.save(skip_jobs: true, create: true)
 
       if template.errors.any?
         failures.push(
-          id: json['id'],
+          id: template.data['id'],
           messages: template.errors.full_messages.join(', ')
         )
       else
         imported.push(
-          id: json['id'],
+          id: template.data['id'],
-          name: json['name']
+          name: template.data['name']
         )
       end
     end

app/controllers/custom_wizard/admin/submissions.rb

@@ -13,34 +13,29 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
   def show
     render_json_dump(
       wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
-      submissions: build_submissions.as_json
+      submissions: ActiveModel::ArraySerializer.new(
+        submission_list.submissions,
+        each_serializer: CustomWizard::SubmissionSerializer
+      ),
+      total: submission_list.total
     )
   end
 
   def download
-    send_data build_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"
   end
 
-  private
+  protected
 
-  def build_submissions
+  def submission_list
-    PluginStoreRow.where(plugin_name: "#{@wizard.id}_submissions")
+    CustomWizard::Submission.list(@wizard, page: params[:page].to_i)
-      .order('id DESC')
-      .map do |row|
-        value = ::JSON.parse(row.value)
-
-        if user = User.find_by(id: row.key)
-          username = user.username
-        else
-          username = I18n.t('admin.wizard.submissions.no_user', id: row.key)
-        end
-
-        value.map do |v|
-          { username: username }.merge!(v.except("redirect_to"))
-        end
-      end.flatten
   end
 end

app/controllers/custom_wizard/admin/wizard.rb

@@ -37,7 +37,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
     wizard_id = template.save(create: params[:create])
 
     if template.errors.any?
-      render json: failed_json.merge(errors: result.errors.full_messages)
+      render json: failed_json.merge(backend_validation_error: template.errors.full_messages.join("\n\n"))
     else
       render json: success_json.merge(wizard_id: wizard_id)
     end
@@ -79,21 +79,28 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
       :required,
       :prompt_completion,
       :restart_on_revisit,
+      :resume_on_revisit,
       :theme_id,
       permitted: mapped_params,
       steps: [
         :id,
+        :index,
         :title,
         :key,
         :banner,
+        :banner_upload_id,
         :raw_description,
         :required_data_message,
+        :force_final,
         required_data: mapped_params,
         permitted_params: mapped_params,
+        condition: mapped_params,
         fields: [
           :id,
+          :index,
           :label,
           :image,
+          :image_upload_id,
           :description,
           :required,
           :key,
@@ -105,9 +112,15 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
           :format,
           :limit,
           :property,
+          :preview_template,
+          :placeholder,
+          :can_create_tag,
           prefill: mapped_params,
           content: mapped_params,
+          condition: mapped_params,
+          index: mapped_params,
           validations: {},
+          tag_groups: [],
         ]
       ],
       actions: [
@@ -151,7 +164,9 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
         mentionable_level: mapped_params,
         messageable_level: mapped_params,
         visibility_level: mapped_params,
-        members_visibility_level: mapped_params
+        members_visibility_level: mapped_params,
+        add_event: mapped_params,
+        add_location: mapped_params
       ]
     )
   end

app/controllers/custom_wizard/steps.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+class CustomWizard::StepsController < ::CustomWizard::WizardClientController
+  before_action :ensure_can_update
+
+  def update
+    update = update_params.to_h
+
+    update[:fields] = {}
+    if params[:fields]
+      field_ids = @builder.wizard.field_ids
+      params[:fields].each do |k, v|
+        update[:fields][k] = v if field_ids.include? k
+      end
+    end
+
+    @builder.build
+
+    updater = @builder.wizard.create_updater(update[:step_id], update[:fields])
+    updater.update
+    @result = updater.result
+
+    if updater.success?
+      wizard_id = update_params[:wizard_id]
+      builder = CustomWizard::Builder.new(wizard_id, current_user, guest_id)
+      @wizard = builder.build(force: true)
+
+      current_step = @wizard.find_step(update[:step_id])
+      current_submission = @wizard.current_submission
+      result = {}
+
+      if current_step.conditional_final_step && !current_step.last_step
+        current_step.force_final = true
+      end
+
+      if current_step.final?
+        builder.template.actions.each do |action_template|
+          if action_template['run_after'] === 'wizard_completion'
+            action_result = CustomWizard::Action.new(
+              action: action_template,
+              wizard: @wizard,
+              submission: current_submission
+            ).perform
+
+            if action_result.success?
+              current_submission = action_result.submission
+            end
+          end
+        end
+
+        current_submission.save
+
+        if redirect = get_redirect
+          updater.result[:redirect_on_complete] = redirect
+        end
+
+        @wizard.cleanup_on_complete!
+
+        result[:final] = true
+      else
+        current_submission.save
+
+        result[:final] = false
+        result[:next_step_id] = current_step.next.id
+      end
+
+      result.merge!(updater.result) if updater.result.present?
+      result[:refresh_required] = true if updater.refresh_required?
+      result[:wizard] = ::CustomWizard::WizardSerializer.new(
+        @wizard,
+        scope: Guardian.new(current_user),
+        root: false
+      ).as_json
+
+      render json: result
+    else
+      errors = []
+      updater.errors.messages.each do |field, msg|
+        errors << { field: field, description: msg.join(',') }
+      end
+      render json: { errors: errors }, status: 422
+    end
+  end
+
+  private
+
+  def ensure_can_update
+    raise Discourse::InvalidParameters.new(:wizard_id) if @builder.template.nil?
+    raise Discourse::InvalidAccess.new if !@builder.wizard || !@builder.wizard.can_access?
+
+    @step_template = @builder.template.steps.select do |s|
+      s['id'] == update_params[:step_id]
+    end.first
+    raise Discourse::InvalidParameters.new(:step_id) if !@step_template
+    raise Discourse::InvalidAccess.new if !@builder.check_condition(@step_template)
+  end
+
+  def update_params
+    @update_params || begin
+      params.require(:step_id)
+      params.require(:wizard_id)
+      params.permit(:wizard_id, :step_id).transform_values { |v| v.underscore }
+    end
+  end
+
+  def get_redirect
+    return @result[:redirect_on_next] if @result[:redirect_on_next].present?
+
+    submission = @wizard.current_submission
+    return nil unless submission.present?
+    ## route_to set by actions, redirect_on_complete set by actions, redirect_to set at wizard entry
+    submission.route_to || submission.redirect_on_complete || submission.redirect_to
+  end
+end

app/controllers/custom_wizard/wizard.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+class CustomWizard::WizardController < ::CustomWizard::WizardClientController
+  def show
+    if wizard.present?
+      render json: CustomWizard::WizardSerializer.new(wizard, scope: guardian, root: false).as_json, status: 200
+    else
+      render json: { error: I18n.t('wizard.none') }
+    end
+  end
+
+  def skip
+    params.require(:wizard_id)
+
+    if wizard.required && !wizard.completed? && wizard.permitted?
+      return render json: { error: I18n.t('wizard.no_skip') }
+    end
+
+    result = { success: 'OK' }
+
+    if current_user && wizard.can_access?
+      if redirect_to = wizard.current_submission&.redirect_to
+        result.merge!(redirect_to: redirect_to)
+      end
+
+      wizard.cleanup_on_skip!
+    end
+
+    render json: result
+  end
+
+  protected
+
+  def wizard
+    @wizard ||= begin
+      return nil unless @builder.present?
+      @builder.build({ reset: params[:reset] }, params)
+    end
+  end
+end

app/controllers/custom_wizard/wizard_client.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+class CustomWizard::WizardClientController < ::ApplicationController
+  before_action :ensure_plugin_enabled
+  before_action :set_builder
+
+  private
+
+  def ensure_plugin_enabled
+    unless SiteSetting.custom_wizard_enabled
+      redirect_to path("/")
+    end
+  end
+
+  def guest_id
+    return nil if current_user.present?
+    cookies[:custom_wizard_guest_id] ||= CustomWizard::Wizard.generate_guest_id
+    cookies[:custom_wizard_guest_id]
+  end
+
+  def set_builder
+    @builder = CustomWizard::Builder.new(params[:wizard_id].underscore, current_user, guest_id)
+  end
+end

app/jobs/regular/set_after_time_wizard.rb

@@ -9,11 +9,13 @@ module Jobs
           user_ids = []
 
           User.human_users.each do |user|
-            if CustomWizard::Wizard.set_wizard_redirect(wizard.id, user)
+            if CustomWizard::Wizard.set_user_redirect(wizard.id, user)
               user_ids.push(user.id)
             end
           end
 
+          CustomWizard::Template.clear_cache_keys
+
           MessageBus.publish "/redirect_to_wizard", wizard.id, user_ids: user_ids
         end
       end

app/serializers/custom_wizard/log_serializer.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CustomWizard::LogSerializer < ApplicationSerializer
+  attributes :date,
+             :action,
+             :username,
+             :message
+
+  has_one :user, serializer: ::BasicUserSerializer, embed: :objects
+end

app/serializers/custom_wizard/submission_serializer.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+class CustomWizard::SubmissionSerializer < ApplicationSerializer
+  attributes :id,
+             :fields,
+             :submitted_at,
+             :user
+
+  def include_user?
+    object.wizard.user.present?
+  end
+
+  def user
+    ::BasicUserSerializer.new(object.wizard.user, root: false).as_json
+  end
+
+  def fields
+    @fields ||= begin
+      result = {}
+
+     object.wizard.template['steps'].each do |step|
+       step['fields'].each do |field|
+         if value = object.fields[field['id']]
+           result[field['id']] = {
+             value: value,
+             type: field['type'],
+             label: field['label']
+           }
+         end
+       end
+     end
+
+     result
+    end
+  end
+end

app/serializers/custom_wizard/wizard_field_serializer.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+class CustomWizard::FieldSerializer < ::ApplicationSerializer
+
+  attributes :id,
+             :index,
+             :type,
+             :required,
+             :value,
+             :label,
+             :placeholder,
+             :description,
+             :image,
+             :file_types,
+             :format,
+             :limit,
+             :property,
+             :content,
+             :tag_groups,
+             :can_create_tag,
+             :validations,
+             :max_length,
+             :char_counter,
+             :preview_template
+
+  def id
+    object.id
+  end
+
+  def index
+    object.index
+  end
+
+  def type
+    object.type
+  end
+
+  def required
+    object.required
+  end
+
+  def value
+    object.value
+  end
+
+  def label
+    I18n.t("#{i18n_key}.label", default: object.label, base_url: Discourse.base_url)
+  end
+
+  def include_label?
+    label.present?
+  end
+
+  def description
+    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
+  end
+
+  def include_description?
+    description.present?
+  end
+
+  def placeholder
+    I18n.t("#{i18n_key}.placeholder", default: object.placeholder)
+  end
+
+  def include_placeholder?
+    placeholder.present?
+  end
+
+  def image
+    object.image
+  end
+
+  def include_image?
+    object.image.present?
+  end
+
+  def file_types
+    object.file_types
+  end
+
+  def format
+    object.format
+  end
+
+  def limit
+    object.limit
+  end
+
+  def property
+    object.property
+  end
+
+  def content
+    object.content
+  end
+
+  def tag_groups
+    object.tag_groups
+  end
+
+  def can_create_tag
+    object.can_create_tag
+  end
+
+  def validations
+    validations = {}
+    object.validations&.each do |type, props|
+      next unless props["status"]
+      validations[props["position"]] ||= {}
+      validations[props["position"]][type] = props.merge CustomWizard::RealtimeValidation.types[type.to_sym]
+    end
+
+    validations
+  end
+
+  def max_length
+    object.max_length
+  end
+
+  def char_counter
+    object.char_counter
+  end
+
+  def preview_template
+    object.preview_template
+  end
+
+  protected
+
+  def i18n_key
+    @i18n_key ||= "#{object.step.wizard.id}.#{object.step.id}.#{object.id}".underscore
+  end
+
+  def subscribed?
+    @subscribed ||= CustomWizard::Subscription.subscribed?
+  end
+end

app/serializers/custom_wizard/wizard_serializer.rb

@@ -4,16 +4,15 @@ class CustomWizard::WizardSerializer < CustomWizard::BasicWizardSerializer
 
   attributes :start,
              :background,
+             :submission_last_updated_at,
              :theme_id,
              :completed,
              :required,
              :permitted,
-             :uncategorized_category_id
+             :resume_on_revisit
 
   has_many :steps, serializer: ::CustomWizard::StepSerializer, embed: :objects
   has_one :user, serializer: ::BasicUserSerializer, embed: :objects
-  has_many :categories, serializer: ::BasicCategorySerializer, embed: :objects
-  has_many :groups, serializer: ::BasicGroupSerializer, embed: :objects
 
   def completed
     object.completed?
@@ -30,30 +29,18 @@ class CustomWizard::WizardSerializer < CustomWizard::BasicWizardSerializer
   end
 
   def start
-    object.start.id
+    object.start
   end
 
   def include_start?
     include_steps? && object.start.present?
   end
 
+  def submission_last_updated_at
+    object.current_submission.updated_at
+  end
+
   def include_steps?
     !include_completed?
   end
-
-  def include_categories?
-    object.needs_categories
-  end
-
-  def include_groups?
-    object.needs_groups
-  end
-
-  def uncategorized_category_id
-    SiteSetting.uncategorized_category_id
-  end
-
-  def include_uncategorized_category_id?
-    object.needs_categories
-  end
 end

app/serializers/custom_wizard/wizard_step_serializer.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+class CustomWizard::StepSerializer < ::ApplicationSerializer
+
+  attributes :id,
+             :index,
+             :next,
+             :previous,
+             :description,
+             :title,
+             :banner,
+             :permitted,
+             :permitted_message,
+             :final
+
+  has_many :fields, serializer: ::CustomWizard::FieldSerializer, embed: :objects
+
+  def id
+    object.id
+  end
+
+  def index
+    object.index
+  end
+
+  def next
+    object.next.id if object.next.present?
+  end
+
+  def include_next?
+    object.next.present?
+  end
+
+  def previous
+    object.previous.id if object.previous.present?
+  end
+
+  def include_previous?
+    object.previous.present?
+  end
+
+  def title
+    I18n.t("#{i18n_key}.title", default: object.title, base_url: Discourse.base_url)
+  end
+
+  def include_title?
+    title.present?
+  end
+
+  def description
+    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
+  end
+
+  def include_description?
+    description.present?
+  end
+
+  def banner
+    object.banner
+  end
+
+  def include_banner?
+    object.banner.present?
+  end
+
+  def permitted
+    object.permitted
+  end
+
+  def permitted_message
+    object.permitted_message
+  end
+
+  def final
+    object.final?
+  end
+
+  protected
+
+  def i18n_key
+    @i18n_key ||= "#{object.wizard.id}.#{object.id}".underscore
+  end
+end

app/views/layouts/qunit.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Custom Wizard QUnit Test Runner</title>
+    <%= discourse_stylesheet_link_tag(:test_helper, theme_id: nil) %>
+    <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %>
+    <%= discourse_stylesheet_link_tag :wizard_custom %>
+    <%= preload_script "locales/en" %>
+    <%= preload_script "ember_jquery" %>
+    <%= preload_script "wizard-vendor" %>
+    <%= preload_script "wizard-custom" %>
+    <%= preload_script "wizard-raw-templates" %>
+    <%= preload_script "wizard-plugin" %>
+    <%= preload_script "pretty-text-bundle" %>
+    <%= preload_script "wizard-qunit" %>
+    <%= csrf_meta_tags %>
+
+    <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
+
+    <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
+    <meta name="discourse_theme_id" content="">
+    <meta name="discourse-base-uri" content="<%= Discourse.base_path %>">
+  </head>
+  <body class="custom-wizard">
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+  </body>
+</html>

assets/javascripts/discourse/components/custom-field-input.js.es6

@@ -1,119 +1,126 @@
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { or, alias } from "@ember/object/computed";
+import { alias, equal, or } from "@ember/object/computed";
-
+import I18n from "I18n";
-const generateContent = function(array, type) {
-  return array.map(key => ({
-    id: key,
-    name: I18n.t(`admin.wizard.custom_field.${type}.${key}`)
-  }));
-}
 
 export default Component.extend({
-  tagName: 'tr',
+  tagName: "tr",
-  topicSerializers: ['topic_view', 'topic_list_item'],
+  topicSerializers: ["topic_view", "topic_list_item"],
-  postSerializers: ['post'],
+  postSerializers: ["post"],
-  groupSerializers: ['basic_group'],
+  groupSerializers: ["basic_group"],
-  categorySerializers: ['basic_category'],
+  categorySerializers: ["basic_category"],
-  klassContent: generateContent(['topic', 'post', 'group', 'category'], 'klass'),
+  showInputs: or("field.new", "field.edit"),
-  typeContent: generateContent(['string', 'boolean', 'integer', 'json'], 'type'),
+  classNames: ["custom-field-input"],
-  showInputs: or('field.new', 'field.edit'),
+  loading: or("saving", "destroying"),
-  classNames: ['custom-field-input'],
+  destroyDisabled: alias("loading"),
-  loading: or('saving', 'destroying'),
+  closeDisabled: alias("loading"),
-  destroyDisabled: alias('loading'),
+  isExternal: equal("field.id", "external"),
-  closeDisabled: alias('loading'),
+
-  
   didInsertElement() {
-    this.set('originalField', JSON.parse(JSON.stringify(this.field)));
+    this.set("originalField", JSON.parse(JSON.stringify(this.field)));
   },
-  
+
-  @discourseComputed('field.klass')
+  @discourseComputed("field.klass")
-  serializerContent(klass, p2) {
+  serializerContent(klass) {
     const serializers = this.get(`${klass}Serializers`);
-    
+
     if (serializers) {
-      return generateContent(serializers, 'serializers');
+      return serializers.reduce((result, key) => {
-    } else {
+        result.push({
-      return [];
+          id: key,
+          name: I18n.t(`admin.wizard.custom_field.serializers.${key}`),
+        });
+        return result;
+      }, []);
     }
   },
-  
+
-  @observes('field.klass')
+  @observes("field.klass")
   clearSerializersWhenClassChanges() {
-    this.set('field.serializers', null);
+    this.set("field.serializers", null);
   },
-  
+
   compareArrays(array1, array2) {
-    return array1.length === array2.length && array1.every((value, index) => {
+    return (
-      return value === array2[index];
+      array1.length === array2.length &&
-    });
+      array1.every((value, index) => {
+        return value === array2[index];
+      })
+    );
   },
-  
+
   @discourseComputed(
-    'saving',
+    "saving",
-    'field.name',
+    "isExternal",
-    'field.klass',
+    "field.name",
-    'field.type',
+    "field.klass",
-    'field.serializers'
+    "field.type",
+    "field.serializers"
   )
-  saveDisabled(saving) {
+  saveDisabled(saving, isExternal) {
-    if (saving) return true;
+    if (saving || isExternal) {
-    
+      return true;
+    }
+
     const originalField = this.originalField;
-    if (!originalField) return false;
+    if (!originalField) {
-        
+      return false;
-    return ['name', 'klass', 'type', 'serializers'].every(attr => {
+    }
+
+    return ["name", "klass", "type", "serializers"].every((attr) => {
       let current = this.get(attr);
       let original = originalField[attr];
-      
+
-      if (!current) return false;
+      if (!current) {
-      
+        return false;
-      if (attr == 'serializers') {
+      }
+
+      if (attr === "serializers") {
         return this.compareArrays(current, original);
       } else {
-        return current == original;
+        return current === original;
       }
     });
   },
-  
+
   actions: {
     edit() {
-      this.set('field.edit', true);
+      this.set("field.edit", true);
     },
-    
+
     close() {
       if (this.field.edit) {
-        this.set('field.edit', false);
+        this.set("field.edit", false);
       }
     },
-    
+
     destroy() {
-      this.set('destroying', true);
+      this.set("destroying", true);
       this.removeField(this.field);
     },
-    
+
     save() {
-      this.set('saving', true);
+      this.set("saving", true);
-      
+
       const field = this.field;
-      
+
       let data = {
         id: field.id,
         klass: field.klass,
         type: field.type,
         serializers: field.serializers,
-        name: field.name
+        name: field.name,
-      }
+      };
-      
+
       this.saveField(data).then((result) => {
-        this.set('saving', false);
+        this.set("saving", false);
         if (result.success) {
-          this.set('field.edit', false);
+          this.set("field.edit", false);
         } else {
-          this.set('saveIcon', 'times');
+          this.set("saveIcon", "times");
         }
-        setTimeout(() => this.set('saveIcon', null), 10000);
+        setTimeout(() => this.set("saveIcon", null), 10000);
       });
-    }
+    },
-  }
+  },
-});
+});

assets/javascripts/discourse/components/custom-user-selector.js.es6

@@ -0,0 +1,146 @@
+import {
+  default as computed,
+  observes,
+} from "discourse-common/utils/decorators";
+import { renderAvatar } from "discourse/helpers/user-avatar";
+import userSearch from "discourse/lib/user-search";
+import I18n from "I18n";
+import Handlebars from "handlebars";
+import { isEmpty } from "@ember/utils";
+import TextField from "discourse/components/text-field";
+
+const template = function (params) {
+  const options = params.options;
+  let html = "<div class='autocomplete'>";
+
+  if (options.users) {
+    html += "<ul>";
+    options.users.forEach((u) => {
+      html += `<li><a href title="${u.name}">`;
+      html += renderAvatar(u, { imageSize: "tiny" });
+      html += `<span class='username'>${u.username}</span>`;
+      if (u.name) {
+        html += `<span class='name'>${u.name}</span>`;
+      }
+      html += `</a></li>`;
+    });
+    html += "</ul>";
+  }
+
+  html += "</div>";
+
+  return new Handlebars.SafeString(html).string;
+};
+
+export default TextField.extend({
+  attributeBindings: ["autofocus", "maxLength"],
+  autocorrect: false,
+  autocapitalize: false,
+  name: "user-selector",
+  id: "custom-member-selector",
+
+  @computed("placeholderKey")
+  placeholder(placeholderKey) {
+    return placeholderKey ? I18n.t(placeholderKey) : "";
+  },
+
+  @observes("usernames")
+  _update() {
+    if (this.get("canReceiveUpdates") === "true") {
+      this.didInsertElement({ updateData: true });
+    }
+  },
+
+  didInsertElement(opts) {
+    this._super();
+    let self = this,
+      selected = [],
+      groups = [],
+      includeMentionableGroups =
+        this.get("includeMentionableGroups") === "true",
+      includeMessageableGroups =
+        this.get("includeMessageableGroups") === "true",
+      includeGroups = this.get("includeGroups") === "true",
+      allowedUsers = this.get("allowedUsers") === "true";
+
+    function excludedUsernames() {
+      // hack works around some issues with allowAny eventing
+      const usernames = self.get("single") ? [] : selected;
+      return usernames;
+    }
+    $(this.element)
+      .val(this.get("usernames"))
+      .autocomplete({
+        template,
+        disabled: this.get("disabled"),
+        single: this.get("single"),
+        allowAny: this.get("allowAny"),
+        updateData: opts && opts.updateData ? opts.updateData : false,
+
+        dataSource(term) {
+          const termRegex = /[^a-zA-Z0-9_\-\.@\+]/;
+          let results = userSearch({
+            term: term.replace(termRegex, ""),
+            topicId: self.get("topicId"),
+            exclude: excludedUsernames(),
+            includeGroups,
+            allowedUsers,
+            includeMentionableGroups,
+            includeMessageableGroups,
+          });
+
+          return results;
+        },
+
+        transformComplete(v) {
+          if (v.username || v.name) {
+            if (!v.username) {
+              groups.push(v.name);
+            }
+            return v.username || v.name;
+          } else {
+            let excludes = excludedUsernames();
+            return v.usernames.filter(function (item) {
+              return excludes.indexOf(item) === -1;
+            });
+          }
+        },
+
+        onChangeItems(items) {
+          let hasGroups = false;
+          items = items.map(function (i) {
+            if (groups.indexOf(i) > -1) {
+              hasGroups = true;
+            }
+            return i.username ? i.username : i;
+          });
+          self.set("usernames", items.join(","));
+          self.set("hasGroups", hasGroups);
+
+          selected = items;
+          if (self.get("onChangeCallback")) {
+            self.sendAction("onChangeCallback");
+          }
+        },
+
+        reverseTransform(i) {
+          return { username: i };
+        },
+      });
+  },
+
+  willDestroyElement() {
+    this._super();
+    $(this.element).autocomplete("destroy");
+  },
+
+  // THIS IS A HUGE HACK TO SUPPORT CLEARING THE INPUT
+  @observes("usernames")
+  _clearInput: function () {
+    if (arguments.length > 1) {
+      if (isEmpty(this.get("usernames"))) {
+        $(this.element).parent().find("a").click();
+      }
+    }
+  },
+});

assets/javascripts/discourse/components/custom-wizard-category-selector.js.es6

@@ -0,0 +1,18 @@
+import CategorySelector from "select-kit/components/category-selector";
+import { computed } from "@ember/object";
+import { makeArray } from "discourse-common/lib/helpers";
+
+export default CategorySelector.extend({
+  classNames: ["category-selector", "wizard-category-selector"],
+  content: computed(
+    "categories.[]",
+    "blacklist.[]",
+    "whitelist.[]",
+    function () {
+      return this._super().filter((category) => {
+        const whitelist = makeArray(this.whitelist);
+        return !whitelist.length || whitelist.indexOf(category.id) > -1;
+      });
+    }
+  ),
+});

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

@@ -0,0 +1,213 @@
+import ComposerEditor from "discourse/components/composer-editor";
+import {
+  bind,
+  default as discourseComputed,
+  on,
+} from "discourse-common/utils/decorators";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
+import { scheduleOnce } from "@ember/runloop";
+import { caretPosition, inCodeBlock } from "discourse/lib/utilities";
+import highlightSyntax from "discourse/lib/highlight-syntax";
+import { alias } from "@ember/object/computed";
+import Site from "discourse/models/site";
+import { uploadIcon } from "discourse/lib/uploads";
+import { dasherize } from "@ember/string";
+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;
+
+export default ComposerEditor.extend({
+  modal: service(),
+
+  classNameBindings: ["fieldClass"],
+  allowUpload: true,
+  showLink: false,
+  topic: null,
+  showToolbar: true,
+  focusTarget: "reply",
+  canWhisper: false,
+  lastValidatedAt: "lastValidatedAt",
+  popupMenuOptions: [],
+  draftStatus: "null",
+  replyPlaceholder: alias("field.translatedPlaceholder"),
+  wizardEventFieldId: null,
+  composerEventPrefix: "wizard-editor",
+
+  @on("didInsertElement")
+  _composerEditorInit() {
+    const $input = $(this.element.querySelector(".d-editor-input"));
+
+    if (this.siteSettings.enable_mentions) {
+      $input.autocomplete({
+        template: findRawTemplate("user-selector-autocomplete"),
+        dataSource: (term) => this._userSearchTerm.call(this, term),
+        key: "@",
+        transformComplete: (v) => v.username || v.name,
+        afterComplete: (value) => {
+          this.composer.set("reply", value);
+          scheduleOnce("afterRender", () => $input.blur().focus());
+        },
+        triggerRule: (textarea) =>
+          !inCodeBlock(textarea.value, caretPosition(textarea)),
+      });
+    }
+
+    const siteSettings = this.siteSettings;
+    if (siteSettings.mentionables_enabled) {
+      Site.currentProp("mentionable_items", this.wizard.mentionable_items);
+      const { SEPARATOR } = requirejs(
+        "discourse/plugins/discourse-mentionables/discourse/lib/discourse-markdown/mentionable-items"
+      );
+      const { searchMentionableItem } = requirejs(
+        "discourse/plugins/discourse-mentionables/discourse/lib/mentionable-item-search"
+      );
+
+      $input.autocomplete({
+        template: findRawTemplate("javascripts/mentionable-item-autocomplete"),
+        key: SEPARATOR,
+        afterComplete: (value) => {
+          this.composer.set("reply", value);
+          scheduleOnce("afterRender", () => $input.blur().focus());
+        },
+        transformComplete: (item) => item.model.slug,
+        dataSource: (term) =>
+          term.match(/\s/) ? null : searchMentionableItem(term, siteSettings),
+        triggerRule: (textarea) =>
+          !inCodeBlock(textarea.value, caretPosition(textarea)),
+      });
+    }
+
+    $input.on("scroll", this._throttledSyncEditorAndPreviewScroll);
+    this._bindUploadTarget();
+
+    const field = this.field;
+    this.editorInputClass = `.${dasherize(field.type)}-${dasherize(
+      field.id
+    )} .d-editor-input`;
+
+    this._uppyInstance.on("file-added", () => {
+      this.session.set("wizardEventFieldId", field.id);
+    });
+  },
+
+  @discourseComputed("field.id")
+  fileUploadElementId(fieldId) {
+    return `file-uploader-${dasherize(fieldId)}`;
+  },
+
+  @discourseComputed
+  allowedFileTypes() {
+    return this.siteSettings.authorized_extensions
+      .split("|")
+      .map((ext) => "." + ext)
+      .join(",");
+  },
+
+  @discourseComputed()
+  uploadIcon() {
+    return uploadIcon(false, this.siteSettings);
+  },
+
+  @bind
+  _handleImageDeleteButtonClick(event) {
+    if (!event.target.classList.contains("delete-image-button")) {
+      return;
+    }
+
+    const index = parseInt(
+      event.target.closest(".button-wrapper").dataset.imageIndex,
+      10
+    );
+    const matchingPlaceholder =
+      this.get("composer.reply").match(IMAGE_MARKDOWN_REGEX);
+
+    this.session.set("wizardEventFieldId", this.field.id);
+    this.appEvents.trigger(
+      "composer:replace-text",
+      matchingPlaceholder[index],
+      "",
+      { regex: IMAGE_MARKDOWN_REGEX, index }
+    );
+  },
+
+  actions: {
+    extraButtons(toolbar) {
+      const component = this;
+
+      if (this.allowUpload && this.uploadIcon) {
+        toolbar.addButton({
+          id: "upload",
+          group: "insertions",
+          icon: this.uploadIcon,
+          title: "upload",
+          sendAction: (event) => component.send("showUploadModal", event),
+        });
+      }
+
+      toolbar.addButton({
+        id: "link",
+        group: "insertions",
+        shortcut: "K",
+        trimLeading: true,
+        unshift: true,
+        sendAction: (event) => component.send("showLinkModal", event),
+      });
+
+      if (this.siteSettings.mentionables_enabled) {
+        const { SEPARATOR } = requirejs(
+          "discourse/plugins/discourse-mentionables/discourse/lib/discourse-markdown/mentionable-items"
+        );
+
+        toolbar.addButton({
+          id: "insert-mentionable",
+          group: "extras",
+          icon: this.siteSettings.mentionables_composer_button_icon,
+          title: "mentionables.composer.insert.title",
+          perform: () => {
+            this.appEvents.trigger("wizard-editor:insert-text", {
+              fieldId: this.field.id,
+              text: SEPARATOR,
+            });
+            const $textarea = $(
+              document.querySelector(
+                `.composer-field.${this.field.id} textarea.d-editor-input`
+              )
+            );
+            $textarea.trigger("keyup.autocomplete");
+          },
+        });
+      }
+    },
+
+    previewUpdated(preview) {
+      highlightSyntax(preview, this.siteSettings, this.session);
+
+      if (this.siteSettings.mentionables_enabled) {
+        const { linkSeenMentionableItems } = requirejs(
+          "discourse/plugins/discourse-mentionables/discourse/lib/mentionable-items-preview-styling"
+        );
+        linkSeenMentionableItems(preview, this.siteSettings);
+      }
+      this._super(...arguments);
+    },
+
+    showLinkModal(toolbarEvent) {
+      let linkText = "";
+      this._lastSel = toolbarEvent.selected;
+
+      if (this._lastSel) {
+        linkText = this._lastSel.value;
+      }
+      this.modal.show(InsertHyperlink, {
+        model: { linkText, toolbarEvent },
+      });
+    },
+
+    showUploadModal() {
+      this.session.set("wizardEventFieldId", this.field.id);
+      document.getElementById(this.fileUploadElementId).click();
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-date-input.js.es6

@@ -0,0 +1,17 @@
+import DateInput from "discourse/components/date-input";
+import discourseComputed from "discourse-common/utils/decorators";
+
+export default DateInput.extend({
+  useNativePicker: false,
+  classNameBindings: ["fieldClass"],
+
+  @discourseComputed()
+  placeholder() {
+    return this.format;
+  },
+  _opts() {
+    return {
+      format: this.format || "LL",
+    };
+  },
+});

assets/javascripts/discourse/components/custom-wizard-date-time-input.js.es6

@@ -1,14 +1,16 @@
 import DateTimeInput from "discourse/components/date-time-input";
-import discourseComputed from 'discourse-common/utils/decorators';
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default DateTimeInput.extend({
-  @discourseComputed('timeFirst', 'tabindex')
+  classNameBindings: ["fieldClass"],
+
+  @discourseComputed("timeFirst", "tabindex")
   timeTabindex(timeFirst, tabindex) {
     return timeFirst ? tabindex : tabindex + 1;
   },
-  
+
-  @discourseComputed('timeFirst', 'tabindex')
+  @discourseComputed("timeFirst", "tabindex")
   dateTabindex(timeFirst, tabindex) {
     return timeFirst ? tabindex + 1 : tabindex;
-  }
+  },
-});
+});

assets/javascripts/discourse/components/custom-wizard-field-category.js.es6

@@ -0,0 +1,42 @@
+import { observes } from "discourse-common/utils/decorators";
+import Category from "discourse/models/category";
+import Component from "@ember/component";
+
+export default Component.extend({
+  didInsertElement() {
+    const property = this.field.property || "id";
+    const value = this.field.value;
+
+    if (value) {
+      this.set(
+        "categories",
+        [...value].reduce((result, v) => {
+          let val =
+            property === "id" ? Category.findById(v) : Category.findBySlug(v);
+          if (val) {
+            result.push(val);
+          }
+          return result;
+        }, [])
+      );
+    }
+  },
+
+  @observes("categories")
+  setValue() {
+    const categories = (this.categories || []).filter((c) => !!c);
+    const property = this.field.property || "id";
+
+    if (categories.length) {
+      this.set(
+        "field.value",
+        categories.reduce((result, c) => {
+          if (c && c[property]) {
+            result.push(c[property]);
+          }
+          return result;
+        }, [])
+      );
+    }
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-checkbox.js.es6

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

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

@@ -0,0 +1,49 @@
+import Component from "@ember/component";
+import { loadOneboxes } from "discourse/lib/load-oneboxes";
+import { schedule } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
+import { resolveAllShortUrls } from "pretty-text/upload-short-url";
+import { ajax } from "discourse/lib/ajax";
+import { on } from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  @on("init")
+  updatePreview() {
+    if (this.isDestroyed) {
+      return;
+    }
+
+    schedule("afterRender", () => {
+      if (this._state !== "inDOM" || !this.element) {
+        return;
+      }
+
+      const $preview = $(this.element);
+
+      if ($preview.length === 0) {
+        return;
+      }
+
+      this.previewUpdated($preview);
+    });
+  },
+
+  previewUpdated($preview) {
+    // Paint oneboxes
+    const paintFunc = () => {
+      loadOneboxes(
+        $preview[0],
+        ajax,
+        null,
+        null,
+        this.siteSettings.max_oneboxes_per_post,
+        true // refresh on every load
+      );
+    };
+
+    discourseDebounce(this, paintFunc, 450);
+
+    // Short upload urls need resolution
+    resolveAllShortUrls(ajax, this.siteSettings, $preview[0]);
+  },
+});

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

@@ -0,0 +1,48 @@
+import {
+  default as computed,
+  observes,
+} from "discourse-common/utils/decorators";
+import EmberObject from "@ember/object";
+import Component from "@ember/component";
+
+export default Component.extend({
+  showPreview: false,
+  classNameBindings: [
+    ":wizard-field-composer",
+    "showPreview:show-preview:hide-preview",
+  ],
+
+  didInsertElement() {
+    this.set(
+      "composer",
+      EmberObject.create({
+        loading: false,
+        reply: this.get("field.value") || "",
+      })
+    );
+  },
+
+  @observes("composer.reply")
+  setField() {
+    this.set("field.value", this.get("composer.reply"));
+  },
+
+  @computed("showPreview")
+  togglePreviewLabel(showPreview) {
+    return showPreview
+      ? "wizard_composer.hide_preview"
+      : "wizard_composer.show_preview";
+  },
+
+  actions: {
+    togglePreview() {
+      this.toggleProperty("showPreview");
+    },
+
+    groupsMentioned() {},
+    afterRefresh() {},
+    cannotSeeMention() {},
+    importQuote() {},
+    showUploadSelector() {},
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-date-time.js.es6

@@ -0,0 +1,15 @@
+import Component from "@ember/component";
+import { observes } from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  @observes("dateTime")
+  setValue() {
+    this.set("field.value", this.dateTime.format(this.field.format));
+  },
+
+  actions: {
+    onChange(value) {
+      this.set("dateTime", moment(value));
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-date.js.es6

@@ -0,0 +1,15 @@
+import Component from "@ember/component";
+import { observes } from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  @observes("date")
+  setValue() {
+    this.set("field.value", this.date.format(this.field.format));
+  },
+
+  actions: {
+    onChange(value) {
+      this.set("date", moment(value));
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-dropdown.js.es6

@@ -0,0 +1,13 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  keyPress(e) {
+    e.stopPropagation();
+  },
+
+  actions: {
+    onChangeValue(value) {
+      this.set("field.value", value);
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-group.js.es6

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

assets/javascripts/discourse/components/custom-wizard-field-number.js.es6

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

assets/javascripts/discourse/components/custom-wizard-field-tag.js.es6

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

assets/javascripts/discourse/components/custom-wizard-field-text.js.es6

@@ -0,0 +1,7 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  keyPress(e) {
+    e.stopPropagation();
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-textarea.js.es6

@@ -0,0 +1,7 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  keyPress(e) {
+    e.stopPropagation();
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-time.js.es6

@@ -0,0 +1,23 @@
+import Component from "@ember/component";
+import { observes } from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  classNameBindings: ["fieldClass"],
+
+  @observes("time")
+  setValue() {
+    this.set("field.value", this.time.format(this.field.format));
+  },
+
+  actions: {
+    onChange(value) {
+      this.set(
+        "time",
+        moment({
+          hours: value.hours,
+          minutes: value.minutes,
+        })
+      );
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-upload.js.es6

@@ -0,0 +1,27 @@
+import UppyUploadMixin from "discourse/mixins/uppy-upload";
+import Component from "@ember/component";
+import { computed } from "@ember/object";
+
+export default Component.extend(UppyUploadMixin, {
+  classNames: ["wizard-field-upload"],
+  classNameBindings: ["isImage", "fieldClass"],
+  uploading: false,
+  type: computed(function () {
+    return `wizard_${this.field.id}`;
+  }),
+  id: computed(function () {
+    return `wizard_field_upload_${this.field.id}`;
+  }),
+  isImage: computed("field.value.extension", function () {
+    return (
+      this.field.value &&
+      this.siteSettings.wizard_recognised_image_upload_formats
+        .split("|")
+        .includes(this.field.value.extension)
+    );
+  }),
+
+  uploadDone(upload) {
+    this.set("field.value", upload);
+  },
+});

assets/javascripts/discourse/components/custom-wizard-field-url.js.es6

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

assets/javascripts/discourse/components/custom-wizard-field-user-selector.js.es6

@@ -0,0 +1,5 @@
+import Component from "@ember/component";
+
+export default Component.extend({
+  classNameBindings: ["fieldClass"],
+});

assets/javascripts/discourse/components/custom-wizard-field.js.es6

@@ -0,0 +1,41 @@
+import Component from "@ember/component";
+import { dasherize } from "@ember/string";
+import discourseComputed from "discourse-common/utils/decorators";
+import { cookAsync } from "discourse/lib/text";
+
+export default Component.extend({
+  classNameBindings: [
+    ":wizard-field",
+    "typeClasses",
+    "field.invalid",
+    "field.id",
+  ],
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    cookAsync(this.field.translatedDescription).then((cookedDescription) => {
+      this.set("cookedDescription", cookedDescription);
+    });
+  },
+
+  @discourseComputed("field.type", "field.id")
+  typeClasses: (type, id) =>
+    `${dasherize(type)}-field ${dasherize(type)}-${dasherize(id)}`,
+
+  @discourseComputed("field.id")
+  fieldClass: (id) => `field-${dasherize(id)} wizard-focusable`,
+
+  @discourseComputed("field.type", "field.id")
+  inputComponentName(type, id) {
+    if (["text_only"].includes(type)) {
+      return false;
+    }
+    return dasherize(type === "component" ? id : `custom-wizard-field-${type}`);
+  },
+
+  @discourseComputed("field.type")
+  textType(fieldType) {
+    return ["text", "textarea"].includes(fieldType);
+  },
+});

assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6

@@ -0,0 +1,19 @@
+import ComboBox from "select-kit/components/combo-box";
+import { computed } from "@ember/object";
+import { makeArray } from "discourse-common/lib/helpers";
+
+export default ComboBox.extend({
+  content: computed("groups.[]", "field.content.[]", function () {
+    const whitelist = makeArray(this.field.content);
+    return this.groups
+      .filter((group) => {
+        return !whitelist.length || whitelist.indexOf(group.id) > -1;
+      })
+      .map((g) => {
+        return {
+          id: g.id,
+          name: g.full_name ? g.full_name : g.name,
+        };
+      });
+  }),
+});

assets/javascripts/discourse/components/custom-wizard-no-access.js.es6

@@ -0,0 +1,29 @@
+import CustomWizard from "../models/custom-wizard";
+import discourseComputed from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import { dasherize } from "@ember/string";
+import getURL from "discourse-common/lib/get-url";
+
+export default Component.extend({
+  classNameBindings: [":wizard-no-access", "reasonClass"],
+
+  @discourseComputed("reason")
+  reasonClass(reason) {
+    return dasherize(reason);
+  },
+
+  @discourseComputed
+  siteName() {
+    return this.siteSettings.title || "";
+  },
+
+  actions: {
+    skip() {
+      if (this.currentUser) {
+        CustomWizard.skip(this.get("wizardId"));
+      } else {
+        window.location = getURL("/");
+      }
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-similar-topics.js.es6

@@ -2,10 +2,10 @@ import Component from "@ember/component";
 import { bind } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
 
-export default Component.extend({ 
+export default Component.extend({
-  classNames: ['wizard-similar-topics'],
+  classNames: ["wizard-similar-topics"],
   showTopics: true,
-  
+
   didInsertElement() {
     $(document).on("click", bind(this, this.documentClick));
   },
@@ -15,22 +15,24 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state == "destroying") return;
+    if (this._state === "destroying") {
+      return;
+    }
     let $target = $(e.target);
 
-    if (!$target.hasClass('show-topics')) {
+    if (!$target.hasClass("show-topics")) {
-      this.set('showTopics', false);
+      this.set("showTopics", false);
     }
   },
-  
+
-  @observes('topics')
+  @observes("topics")
   toggleShowWhenTopicsChange() {
-    this.set('showTopics', true);
+    this.set("showTopics", true);
   },
-  
+
   actions: {
     toggleShowTopics() {
-      this.set('showTopics', true);
+      this.set("showTopics", true);
-    }
+    },
-  }
+  },
-})
+});

assets/javascripts/discourse/components/custom-wizard-step-form.js.es6

@@ -0,0 +1,9 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+
+export default Component.extend({
+  classNameBindings: [":wizard-step-form", "customStepClass"],
+
+  @discourseComputed("step.id")
+  customStepClass: (stepId) => `wizard-step-${stepId}`,
+});

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

@@ -0,0 +1,227 @@
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import Component from "@ember/component";
+import I18n from "I18n";
+import getUrl from "discourse-common/lib/get-url";
+import { htmlSafe } from "@ember/template";
+import { schedule } from "@ember/runloop";
+import { cookAsync } from "discourse/lib/text";
+import CustomWizard, {
+  updateCachedWizard,
+} from "discourse/plugins/discourse-custom-wizard/discourse/models/custom-wizard";
+import { alias, not } from "@ember/object/computed";
+import discourseLater from "discourse-common/lib/later";
+
+const alreadyWarned = {};
+
+export default Component.extend({
+  classNameBindings: [":wizard-step", "step.id"],
+  saving: null,
+
+  init() {
+    this._super(...arguments);
+    this.set("stylingDropdown", {});
+  },
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    cookAsync(this.step.translatedTitle).then((cookedTitle) => {
+      this.set("cookedTitle", cookedTitle);
+    });
+    cookAsync(this.step.translatedDescription).then((cookedDescription) => {
+      this.set("cookedDescription", cookedDescription);
+    });
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.autoFocus();
+  },
+
+  @discourseComputed("step.index", "wizard.required")
+  showQuitButton: (index, required) => index === 0 && !required,
+
+  showNextButton: not("step.final"),
+  showDoneButton: alias("step.final"),
+
+  @discourseComputed(
+    "step.index",
+    "step.displayIndex",
+    "wizard.totalSteps",
+    "wizard.completed"
+  )
+  showFinishButton: (index, displayIndex, total, completed) => {
+    return index !== 0 && displayIndex !== total && completed;
+  },
+
+  @discourseComputed("step.index")
+  showBackButton: (index) => index > 0,
+
+  @discourseComputed("step.banner")
+  bannerImage(src) {
+    if (!src) {
+      return;
+    }
+    return getUrl(src);
+  },
+
+  @discourseComputed("step.id")
+  bannerAndDescriptionClass(id) {
+    return `wizard-banner-and-description wizard-banner-and-description-${id}`;
+  },
+
+  @discourseComputed("step.fields.[]")
+  primaryButtonIndex(fields) {
+    return fields.length + 1;
+  },
+
+  @discourseComputed("step.fields.[]")
+  secondaryButtonIndex(fields) {
+    return fields.length + 2;
+  },
+
+  @observes("step.id")
+  _stepChanged() {
+    this.set("saving", false);
+    this.autoFocus();
+  },
+
+  @observes("step.message")
+  _handleMessage: function () {
+    const message = this.get("step.message");
+    this.showMessage(message);
+  },
+
+  @discourseComputed("step.index", "wizard.totalSteps")
+  barStyle(displayIndex, totalSteps) {
+    let ratio = parseFloat(displayIndex) / parseFloat(totalSteps - 1);
+    if (ratio < 0) {
+      ratio = 0;
+    }
+    if (ratio > 1) {
+      ratio = 1;
+    }
+
+    return htmlSafe(`width: ${ratio * 200}px`);
+  },
+
+  @discourseComputed("step.fields")
+  includeSidebar(fields) {
+    return !!fields.findBy("show_in_sidebar");
+  },
+
+  autoFocus() {
+    discourseLater(() => {
+      schedule("afterRender", () => {
+        if ($(".invalid .wizard-focusable").length) {
+          this.animateInvalidFields();
+        }
+      });
+    });
+  },
+
+  animateInvalidFields() {
+    schedule("afterRender", () => {
+      let $invalid = $(".invalid .wizard-focusable");
+      if ($invalid.length) {
+        $([document.documentElement, document.body]).animate(
+          {
+            scrollTop: $invalid.offset().top - 200,
+          },
+          400
+        );
+      }
+    });
+  },
+
+  advance() {
+    this.set("saving", true);
+    this.get("step")
+      .save()
+      .then((response) => {
+        updateCachedWizard(CustomWizard.build(response["wizard"]));
+
+        if (response["final"]) {
+          CustomWizard.finished(response);
+        } else {
+          this.goNext(response);
+        }
+      })
+      .catch(() => this.animateInvalidFields())
+      .finally(() => this.set("saving", false));
+  },
+
+  actions: {
+    quit() {
+      this.get("wizard").skip();
+    },
+
+    done() {
+      this.send("nextStep");
+    },
+
+    showMessage(message) {
+      this.sendAction(message);
+    },
+
+    stylingDropdownChanged(id, value) {
+      this.set("stylingDropdown", { id, value });
+    },
+
+    exitEarly() {
+      const step = this.step;
+      step.validate();
+
+      if (step.get("valid")) {
+        this.set("saving", true);
+
+        step
+          .save()
+          .then(() => this.send("quit"))
+          .finally(() => this.set("saving", false));
+      } else {
+        this.autoFocus();
+      }
+    },
+
+    backStep() {
+      if (this.saving) {
+        return;
+      }
+
+      this.goBack();
+    },
+
+    nextStep() {
+      if (this.saving) {
+        return;
+      }
+
+      const step = this.step;
+      const result = step.validate();
+
+      if (result.warnings.length) {
+        const unwarned = result.warnings.filter((w) => !alreadyWarned[w]);
+        if (unwarned.length) {
+          unwarned.forEach((w) => (alreadyWarned[w] = true));
+          return window.bootbox.confirm(
+            unwarned.map((w) => I18n.t(`wizard.${w}`)).join("\n"),
+            I18n.t("no_value"),
+            I18n.t("yes_value"),
+            (confirmed) => {
+              if (confirmed) {
+                this.advance();
+              }
+            }
+          );
+        }
+      }
+
+      if (step.get("valid")) {
+        this.advance();
+      } else {
+        this.autoFocus();
+      }
+    },
+  },
+});

assets/javascripts/discourse/components/custom-wizard-tag-chooser.js.es6

@@ -0,0 +1,15 @@
+import TagChooser from "select-kit/components/tag-chooser";
+
+export default TagChooser.extend({
+  searchTags(url, data, callback) {
+    if (this.tagGroups) {
+      let tagGroupsString = this.tagGroups.join(",");
+      data.filterForInput = {
+        name: "custom-wizard-tag-chooser",
+        groups: tagGroupsString,
+      };
+    }
+
+    return this._super(url, data, callback);
+  },
+});

assets/javascripts/discourse/components/custom-wizard-tag-selector.js.es6

@@ -1,4 +1,4 @@
-import TagChooser from 'select-kit/components/tag-chooser';
+import TagChooser from "select-kit/components/tag-chooser";
 import { makeArray } from "discourse-common/lib/helpers";
 
 export default TagChooser.extend({
@@ -7,5 +7,5 @@ export default TagChooser.extend({
       const whitelist = makeArray(context.whitelist);
       return !whitelist.length || whitelist.indexOf(tag.id) > 1;
     });
-  }
+  },
-})
+});

assets/javascripts/discourse/components/custom-wizard-text-field.js.es6

@@ -0,0 +1,44 @@
+import computed from "discourse-common/utils/decorators";
+import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
+import I18n from "I18n";
+import TextField from "discourse/components/text-field";
+
+export default TextField.extend({
+  attributeBindings: [
+    "autocorrect",
+    "autocapitalize",
+    "autofocus",
+    "maxLength",
+    "dir",
+  ],
+
+  @computed
+  dir() {
+    if (this.siteSettings.support_mixed_text_direction) {
+      let val = this.value;
+      if (val) {
+        return isRTL(val) ? "rtl" : "ltr";
+      } else {
+        return siteDir();
+      }
+    }
+  },
+
+  keyUp() {
+    if (this.siteSettings.support_mixed_text_direction) {
+      let val = this.value;
+      if (isRTL(val)) {
+        this.set("dir", "rtl");
+      } else if (isLTR(val)) {
+        this.set("dir", "ltr");
+      } else {
+        this.set("dir", siteDir());
+      }
+    }
+  },
+
+  @computed("placeholderKey")
+  placeholder(placeholderKey) {
+    return placeholderKey ? I18n.t(placeholderKey) : "";
+  },
+});

assets/javascripts/discourse/components/custom-wizard-time-input.js.es6

@@ -1,3 +1,3 @@
 import TimeInput from "discourse/components/time-input";
 
-export default TimeInput.extend();
+export default TimeInput.extend({});

assets/javascripts/discourse/components/field-validators.js.es6

@@ -1,5 +1,5 @@
 import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
+
 export default Component.extend({
   actions: {
     perform() {

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/components/similar-topics-validator.js.es6

@@ -0,0 +1,160 @@
+import WizardFieldValidator from "discourse/plugins/discourse-custom-wizard/discourse/components/validator";
+import { deepMerge } from "discourse-common/lib/object";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { cancel, later } from "@ember/runloop";
+import { A } from "@ember/array";
+import EmberObject, { computed } from "@ember/object";
+import { and, equal, notEmpty } from "@ember/object/computed";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { dasherize } from "@ember/string";
+
+export default WizardFieldValidator.extend({
+  classNames: ["similar-topics-validator"],
+  similarTopics: null,
+  hasInput: notEmpty("field.value"),
+  hasSimilarTopics: notEmpty("similarTopics"),
+  hasNotSearched: equal("similarTopics", null),
+  noSimilarTopics: computed("similarTopics", function () {
+    return this.similarTopics !== null && this.similarTopics.length === 0;
+  }),
+  showSimilarTopics: computed("typing", "hasSimilarTopics", function () {
+    return this.hasSimilarTopics && !this.typing;
+  }),
+  showNoSimilarTopics: computed("typing", "noSimilarTopics", function () {
+    return this.noSimilarTopics && !this.typing;
+  }),
+  hasValidationCategories: notEmpty("validationCategories"),
+  insufficientCharacters: computed("typing", "field.value", function () {
+    return this.hasInput && this.field.value.length < 5 && !this.typing;
+  }),
+  insufficientCharactersCategories: and(
+    "insufficientCharacters",
+    "hasValidationCategories"
+  ),
+
+  @discourseComputed("validation.categories")
+  validationCategories(categoryIds) {
+    if (categoryIds) {
+      return categoryIds.map((id) => this.site.categoriesById[id]);
+    }
+
+    return A();
+  },
+
+  @discourseComputed("validationCategories")
+  catLinks(categories) {
+    return categories.map((category) => categoryBadgeHTML(category)).join("");
+  },
+
+  @discourseComputed(
+    "loading",
+    "showSimilarTopics",
+    "showNoSimilarTopics",
+    "insufficientCharacters",
+    "insufficientCharactersCategories"
+  )
+  currentState(
+    loading,
+    showSimilarTopics,
+    showNoSimilarTopics,
+    insufficientCharacters,
+    insufficientCharactersCategories
+  ) {
+    switch (true) {
+      case loading:
+        return "loading";
+      case showSimilarTopics:
+        return "results";
+      case showNoSimilarTopics:
+        return "no_results";
+      case insufficientCharactersCategories:
+        return "insufficient_characters_categories";
+      case insufficientCharacters:
+        return "insufficient_characters";
+      default:
+        return false;
+    }
+  },
+
+  @discourseComputed("currentState")
+  currentStateClass(currentState) {
+    if (currentState) {
+      return `similar-topics-${dasherize(currentState)}`;
+    }
+
+    return "similar-topics";
+  },
+
+  @discourseComputed("currentState")
+  currentStateKey(currentState) {
+    if (currentState) {
+      return `realtime_validations.similar_topics.${currentState}`;
+    }
+
+    return false;
+  },
+
+  validate() {},
+
+  @observes("field.value")
+  customValidate() {
+    const field = this.field;
+
+    if (!field.value) {
+      this.set("similarTopics", null);
+      return;
+    }
+    const value = field.value;
+
+    this.set("typing", true);
+
+    const lastKeyUp = new Date();
+    this._lastKeyUp = lastKeyUp;
+
+    // One second from now, check to see if the last key was hit when
+    // we recorded it. If it was, the user paused typing.
+    cancel(this._lastKeyTimeout);
+    this._lastKeyTimeout = later(() => {
+      if (lastKeyUp !== this._lastKeyUp) {
+        return;
+      }
+      this.set("typing", false);
+
+      if (value && value.length < 5) {
+        this.set("similarTopics", null);
+        return;
+      }
+
+      this.updateSimilarTopics();
+    }, 1000);
+  },
+
+  updateSimilarTopics() {
+    this.set("similarTopics", null);
+    this.set("updating", true);
+
+    this.backendValidate({
+      title: this.get("field.value"),
+      categories: this.get("validation.categories"),
+      time_unit: this.get("validation.time_unit"),
+      time_n_value: this.get("validation.time_n_value"),
+    })
+      .then((result) => {
+        const similarTopics = A(
+          deepMerge(result["topics"], result["similar_topics"])
+        );
+        similarTopics.forEach(function (topic, index) {
+          similarTopics[index] = EmberObject.create(topic);
+        });
+
+        this.set("similarTopics", similarTopics);
+      })
+      .finally(() => this.set("updating", false));
+  },
+
+  actions: {
+    closeMessage() {
+      this.set("showMessage", false);
+    },
+  },
+});

assets/javascripts/discourse/components/validator.js.es6

@@ -1,17 +1,15 @@
 import Component from "@ember/component";
 import { equal } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
+import { ajax, getToken } from "discourse/lib/ajax";
-import { getToken } from "wizard/lib/ajax";
 
 export default Component.extend({
-  classNames: ['validator'],
+  classNames: ["validator"],
   classNameBindings: ["isValid", "isInvalid"],
   validMessageKey: null,
   invalidMessageKey: null,
   isValid: null,
   isInvalid: equal("isValid", false),
-  layoutName: "components/validator", // useful for sharing the template with extending components
+
-  
   init() {
     this._super(...arguments);
 

assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6

@@ -1,19 +0,0 @@
-import { default as discourseComputed } from 'discourse-common/utils/decorators';
-import Component from '@ember/component';
-
-export default Component.extend({
-  classNames: 'wizard-advanced-toggle',
-  
-  @discourseComputed('showAdvanced')
-  toggleClass(showAdvanced) {
-    let classes = 'btn'
-    if (showAdvanced) classes += ' btn-primary';
-    return classes;
-  },
-  
-  actions: {
-    toggleAdvanced() {
-      this.toggleProperty('showAdvanced');
-    }
-  }
-})

assets/javascripts/discourse/components/wizard-custom-action.js.es6

@@ -1,89 +1,104 @@
-import { default as discourseComputed } from 'discourse-common/utils/decorators';
+import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { equal, empty, or, and } from "@ember/object/computed";
+import { empty, equal, or } from "@ember/object/computed";
-import { generateName, selectKitContent } from '../lib/wizard';
+import { notificationLevels, selectKitContent } from "../lib/wizard";
 import { computed } from "@ember/object";
-import wizardSchema from '../lib/wizard-schema';
+import UndoChanges from "../mixins/undo-changes";
-import UndoChanges from '../mixins/undo-changes';
 import Component from "@ember/component";
-import { notificationLevels } from '../lib/wizard';
 import I18n from "I18n";
 
 export default Component.extend(UndoChanges, {
-  componentType: 'action',
+  componentType: "action",
-  classNameBindings: [':wizard-custom-action', 'visible'],
+  classNameBindings: [":wizard-custom-action", "visible"],
-  visible: computed('currentActionId', function() { return this.action.id === this.currentActionId }),
+  visible: computed("currentActionId", function () {
-  createTopic: equal('action.type', 'create_topic'),
+    return this.action.id === this.currentActionId;
-  updateProfile: equal('action.type', 'update_profile'),
+  }),
-  watchCategories: equal('action.type', 'watch_categories'),
+  createTopic: equal("action.type", "create_topic"),
-  sendMessage: equal('action.type', 'send_message'),
+  updateProfile: equal("action.type", "update_profile"),
-  openComposer: equal('action.type', 'open_composer'),
+  watchCategories: equal("action.type", "watch_categories"),
-  sendToApi: equal('action.type', 'send_to_api'),
+  watchTags: equal("action.type", "watch_tags"),
-  addToGroup: equal('action.type', 'add_to_group'),
+  sendMessage: equal("action.type", "send_message"),
-  routeTo: equal('action.type', 'route_to'),
+  openComposer: equal("action.type", "open_composer"),
-  createCategory: equal('action.type', 'create_category'),
+  sendToApi: equal("action.type", "send_to_api"),
-  createGroup: equal('action.type', 'create_group'),
+  addToGroup: equal("action.type", "add_to_group"),
-  apiEmpty: empty('action.api'),
+  routeTo: equal("action.type", "route_to"),
-  groupPropertyTypes: selectKitContent(['id', 'name']),
+  createCategory: equal("action.type", "create_category"),
-  hasAdvanced: or('hasCustomFields', 'routeTo'),
+  createGroup: equal("action.type", "create_group"),
-  showAdvanced: and('hasAdvanced', 'action.type'),
+  apiEmpty: empty("action.api"),
-  hasCustomFields: or('basicTopicFields', 'updateProfile', 'createGroup', 'createCategory'),
+  groupPropertyTypes: selectKitContent(["id", "name"]),
-  basicTopicFields: or('createTopic', 'sendMessage', 'openComposer'),
+  hasCustomFields: or(
-  publicTopicFields: or('createTopic', 'openComposer'),
+    "basicTopicFields",
-  showPostAdvanced: or('createTopic', 'sendMessage'),
+    "updateProfile",
-  actionTypes: Object.keys(wizardSchema.action.types).map(type => {
+    "createGroup",
+    "createCategory"
+  ),
+  basicTopicFields: or("createTopic", "sendMessage", "openComposer"),
+  publicTopicFields: or("createTopic", "openComposer"),
+  showPostAdvanced: or("createTopic", "sendMessage"),
+  availableNotificationLevels: notificationLevels.map((type) => {
     return {
       id: type,
-      name: I18n.t(`admin.wizard.action.${type}.label`)
+      name: I18n.t(`admin.wizard.action.watch_x.notification_level.${type}`),
     };
   }),
-  availableNotificationLevels: notificationLevels.map((type, index) => {
+
-    return {
+  messageUrl: "https://discourse.pluginmanager.org/t/action-settings",
-      id: type,
+
-      name:  I18n.t(`admin.wizard.action.watch_categories.notification_level.${type}`)
+  @discourseComputed("action.type")
-    };
-  }),
-  
-  messageUrl: 'https://thepavilion.io/t/2810',
-  
-  @discourseComputed('action.type')
   messageKey(type) {
-    let key = 'type';
+    let key = "type";
     if (type) {
-      key = 'edit';
+      key = "edit";
     }
     return key;
   },
-  
+
-  @discourseComputed('wizard.steps')
+  @discourseComputed("action.type")
+  customFieldsContext(type) {
+    return `action.${type}`;
+  },
+
+  @discourseComputed("wizard.steps")
   runAfterContent(steps) {
-    let content = steps.map(function(step) {
+    let content = steps.map(function (step) {
       return {
         id: step.id,
-        name: step.title || step.id
+        name: step.title || step.id,
       };
     });
-    
+
     content.unshift({
-      id: 'wizard_completion',
+      id: "wizard_completion",
-      name: I18n.t('admin.wizard.action.run_after.wizard_completion')
+      name: I18n.t("admin.wizard.action.run_after.wizard_completion"),
     });
-        
+
     return content;
   },
 
-  @discourseComputed('apis')
+  @discourseComputed("apis")
   availableApis(apis) {
-    return apis.map(a => {
+    return apis.map((a) => {
       return {
         id: a.name,
-        name: a.title
+        name: a.title,
       };
     });
   },
 
-  @discourseComputed('apis', 'action.api')
+  @discourseComputed("apis", "action.api")
   availableEndpoints(apis, api) {
-    if (!api) return [];
+    if (!api) {
-    return apis.find(a => a.name === api).endpoints;
+      return [];
-  }
+    }
+    return apis.find((a) => a.name === api).endpoints;
+  },
+
+  @discourseComputed("fieldTypes")
+  hasEventField(fieldTypes) {
+    return fieldTypes.map((ft) => ft.id).includes("event");
+  },
+
+  @discourseComputed("fieldTypes")
+  hasLocationField(fieldTypes) {
+    return fieldTypes.map((ft) => ft.id).includes("location");
+  },
 });

assets/javascripts/discourse/components/wizard-custom-field.js.es6

@@ -1,117 +1,159 @@
-import { default as discourseComputed } from 'discourse-common/utils/decorators';
+import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { equal, or, alias } from "@ember/object/computed";
+import { equal, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
-import { selectKitContent } from '../lib/wizard';
+import { selectKitContent } from "../lib/wizard";
-import UndoChanges from '../mixins/undo-changes';
+import UndoChanges from "../mixins/undo-changes";
 import Component from "@ember/component";
-import wizardSchema from '../lib/wizard-schema';
+import wizardSchema from "../lib/wizard-schema";
 
 export default Component.extend(UndoChanges, {
-  componentType: 'field',
+  componentType: "field",
-  classNameBindings: [':wizard-custom-field', 'visible'],
+  classNameBindings: [":wizard-custom-field", "visible"],
-  visible: computed('currentFieldId', function() { return this.field.id === this.currentFieldId }),
+  visible: computed("currentFieldId", function () {
-  isDropdown: equal('field.type', 'dropdown'),
+    return this.field.id === this.currentFieldId;
-  isUpload: equal('field.type', 'upload'),
+  }),
-  isCategory: equal('field.type', 'category'),
+  isDropdown: equal("field.type", "dropdown"),
-  isGroup: equal('field.type', 'group'),
+  isUpload: equal("field.type", "upload"),
-  isTag: equal('field.type', 'tag'),
+  isCategory: equal("field.type", "category"),
-  isText: equal('field.type', 'text'),
+  isGroup: equal("field.type", "group"),
-  isTextarea: equal('field.type', 'textarea'),
+  isTag: equal("field.type", "tag"),
-  isUrl: equal('field.type', 'url'),
+  isText: equal("field.type", "text"),
-  isComposer: equal('field.type', 'composer'),
+  isTextarea: equal("field.type", "textarea"),
-  showPrefill: or('isText', 'isCategory', 'isTag', 'isGroup', 'isDropdown'),
+  isUrl: equal("field.type", "url"),
-  showContent: or('isCategory', 'isTag', 'isGroup', 'isDropdown'),
+  isComposer: equal("field.type", "composer"),
-  showLimit: or('isCategory', 'isTag'),
+  showPrefill: or("isText", "isCategory", "isTag", "isGroup", "isDropdown"),
-  isTextType: or('isText', 'isTextarea', 'isComposer'),
+  showContent: or("isCategory", "isTag", "isGroup", "isDropdown"),
-  categoryPropertyTypes: selectKitContent(['id', 'slug']),
+  showLimit: or("isCategory", "isTag"),
-  showAdvanced: alias('field.type'),
+  isTextType: or("isText", "isTextarea", "isComposer"),
-  messageUrl: 'https://thepavilion.io/t/2809',
+  isComposerPreview: equal("field.type", "composer_preview"),
-  
+  categoryPropertyTypes: selectKitContent(["id", "slug"]),
-  @discourseComputed('field.type')
+  messageUrl: "https://discourse.pluginmanager.org/t/field-settings",
+
+  @discourseComputed("field.type")
   validations(type) {
     const applicableToField = [];
-    
+
-    for(let validation in wizardSchema.field.validations) {
+    for (let validation in wizardSchema.field.validations) {
-      if ((wizardSchema.field.validations[validation]["types"]).includes(type)) {
+      if (wizardSchema.field.validations[validation]["types"].includes(type)) {
-        applicableToField.push(validation)
+        applicableToField.push(validation);
       }
     }
 
     return applicableToField;
   },
 
-  @discourseComputed('field.type')
+  @discourseComputed("field.type")
   isDateTime(type) {
-    return ['date_time', 'date', 'time'].indexOf(type) > -1;
+    return ["date_time", "date", "time"].indexOf(type) > -1;
   },
-  
+
-  @discourseComputed('field.type')
+  @discourseComputed("field.type")
   messageKey(type) {
-    let key = 'type';
+    let key = "type";
     if (type) {
-      key = 'edit';
+      key = "edit";
     }
     return key;
   },
-  
+
-  setupTypeOutput(fieldType, options) {    
+  setupTypeOutput(fieldType, options) {
     const selectionType = {
-      category: 'category',
+      category: "category",
-      tag: 'tag',
+      tag: "tag",
-      group: 'group'
+      group: "group",
     }[fieldType];
-    
+
     if (selectionType) {
-      options[`${selectionType}Selection`] = 'output';
+      options[`${selectionType}Selection`] = "output";
       options.outputDefaultSelection = selectionType;
     }
 
     return options;
   },
-  
+
-  @discourseComputed('field.type')
+  @discourseComputed("field.type")
   contentOptions(fieldType) {
     let options = {
       wizardFieldSelection: true,
-      textSelection: 'key,value',
+      textSelection: "key,value",
-      userFieldSelection: 'key,value',
+      userFieldSelection: "key,value",
-      context: 'field'
+      context: "field",
-    }
+    };
-    
+
     options = this.setupTypeOutput(fieldType, options);
-    
+
     if (this.isDropdown) {
-      options.wizardFieldSelection = 'key,value';
+      options.wizardFieldSelection = "key,value";
-      options.userFieldOptionsSelection = 'output';
+      options.userFieldOptionsSelection = "output";
-      options.textSelection = 'key,value,output';
+      options.textSelection = "key,value";
-      options.inputTypes = 'conditional,association,assignment';
+      options.inputTypes = "association,conditional,assignment";
-      options.pairConnector = 'association';
+      options.pairConnector = "association";
-      options.keyPlaceholder = 'admin.wizard.key';
+      options.keyPlaceholder = "admin.wizard.key";
-      options.valuePlaceholder = 'admin.wizard.value';
+      options.valuePlaceholder = "admin.wizard.value";
     }
-        
+
     return options;
   },
-  
+
-  @discourseComputed('field.type')
+  @discourseComputed("field.type")
   prefillOptions(fieldType) {
     let options = {
       wizardFieldSelection: true,
       textSelection: true,
-      userFieldSelection: 'key,value',
+      userFieldSelection: "key,value",
-      context: 'field'
+      context: "field",
-    }
+    };
 
     return this.setupTypeOutput(fieldType, options);
   },
-  
+
-  actions: {    
+  @discourseComputed("step.index")
-    imageUploadDone(upload) {
+  fieldConditionOptions(stepIndex) {
-      this.set("field.image", upload.url);
+    const options = {
-    },
+      inputTypes: "validation",
-    
+      context: "field",
-    imageUploadDeleted() {
+      textSelection: "value",
-      this.set("field.image", null);
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options.wizardFieldSelection = true;
+      options.wizardActionSelection = true;
     }
-  }
+
+    return options;
+  },
+
+  @discourseComputed("step.index")
+  fieldIndexOptions(stepIndex) {
+    const options = {
+      context: "field",
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options.wizardFieldSelection = true;
+      options.wizardActionSelection = true;
+    }
+
+    return options;
+  },
+
+  actions: {
+    imageUploadDone(upload) {
+      this.setProperties({
+        "field.image": upload.url,
+        "field.image_upload_id": upload.id,
+      });
+    },
+
+    imageUploadDeleted() {
+      this.setProperties({
+        "field.image": null,
+        "field.image_upload_id": null,
+      });
+    },
+  },
 });

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

@@ -1,16 +1,40 @@
 import Component from "@ember/component";
-import { default as discourseComputed } from 'discourse-common/utils/decorators';
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
-  classNames: 'wizard-custom-step',
+  classNames: "wizard-custom-step",
-  
+
+  @discourseComputed("step.index")
+  stepConditionOptions(stepIndex) {
+    const options = {
+      inputTypes: "validation",
+      context: "step",
+      textSelection: "value",
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options["wizardFieldSelection"] = true;
+      options["wizardActionSelection"] = true;
+    }
+
+    return options;
+  },
+
   actions: {
     bannerUploadDone(upload) {
-      this.set("step.banner", upload.url);
+      this.setProperties({
+        "step.banner": upload.url,
+        "step.banner_upload_id": upload.id,
+      });
     },
-    
+
     bannerUploadDeleted() {
-      this.set("step.banner", null);
+      this.setProperties({
-    }
+        "step.banner": null,
-  }
+        "step.banner_upload_id": null,
+      });
+    },
+  },
 });

assets/javascripts/discourse/components/wizard-links.js.es6

@@ -1,136 +1,150 @@
-import { default as discourseComputed, on, observes } from 'discourse-common/utils/decorators';
+import discourseComputed from "discourse-common/utils/decorators";
-import { generateName } from '../lib/wizard';
+import { generateName } from "../lib/wizard";
-import { default as wizardSchema, setWizardDefaults } from '../lib/wizard-schema';
+import {
+  setWizardDefaults,
+  default as wizardSchema,
+} from "../lib/wizard-schema";
 import { notEmpty } from "@ember/object/computed";
-import { scheduleOnce, bind } from "@ember/runloop";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { A } from "@ember/array";
 
 export default Component.extend({
-  classNameBindings: [':wizard-links', 'itemType'],
+  classNameBindings: [":wizard-links", "itemType"],
   items: A(),
-  anyLinks: notEmpty('links'),
+  anyLinks: notEmpty("links"),
-
-  @on('didInsertElement')
-  @observes('links.[]')
-  setupSortable() {
-    scheduleOnce('afterRender', () => (this.applySortable()));
-  },
-
-  applySortable() {
-    $(this.element).find(".link-list")
-      .sortable({ tolerance: 'pointer' })
-      .on('sortupdate', (e, ui) => {
-        this.updateItemOrder(ui.item.data('id'), ui.item.index());
-      });
-  },
 
   updateItemOrder(itemId, newIndex) {
     const items = this.items;
-    const item = items.findBy('id', itemId);
+    const item = items.findBy("id", itemId);
     items.removeObject(item);
+    item.set("index", newIndex);
     items.insertAt(newIndex, item);
-    scheduleOnce('afterRender', this, () => this.applySortable());
   },
 
-  @discourseComputed('itemType')
+  @discourseComputed("itemType")
   header: (itemType) => `admin.wizard.${itemType}.header`,
 
-  @discourseComputed('current', 'items.@each.id', 'items.@each.type', 'items.@each.label', 'items.@each.title')
+  @discourseComputed(
+    "current",
+    "items.@each.id",
+    "items.@each.type",
+    "items.@each.label",
+    "items.@each.title"
+  )
   links(current, items) {
-    if (!items) return;
+    if (!items) {
+      return;
+    }
 
-    return items.map((item) => {
+    return items.map((item, index) => {
       if (item) {
         let link = {
-          id: item.id
+          id: item.id,
-        }
+        };
 
         let label = item.label || item.title || item.id;
         if (this.generateLabels && item.type) {
           label = generateName(item.type);
         }
-                
+
         link.label = `${label} (${item.id})`;
 
-        let classes = 'btn';
+        let classes = "btn";
         if (current && item.id === current.id) {
-          classes += ' btn-primary';
+          classes += " btn-primary";
-        };
+        }
 
         link.classes = classes;
+        link.index = index;
+
+        if (index === 0) {
+          link.first = true;
+        }
+
+        if (index === items.length - 1) {
+          link.last = true;
+        }
 
         return link;
       }
     });
   },
 
+  getNextIndex() {
+    const items = this.items;
+    if (!items || items.length === 0) {
+      return 0;
+    }
+    const numbers = items
+      .map((i) => Number(i.id.split("_").pop()))
+      .sort((a, b) => a - b);
+    return numbers[numbers.length - 1];
+  },
+
   actions: {
     add() {
-      const items = this.get('items');
+      const items = this.get("items");
       const itemType = this.itemType;
       let params = setWizardDefaults({}, itemType);
-      
+
       params.isNew = true;
-      
+      params.index = this.getNextIndex();
-      let next = 1;
+
-            
+      let id = `${itemType}_${params.index + 1}`;
-      if (items.length) {
+      if (itemType === "field") {
-        next = Math.max.apply(Math, items.map((i) => {
-          let parts = i.id.split('_');
-          let lastPart = parts[parts.length - 1];
-          return isNaN(lastPart) ? 0 : lastPart;
-        })) + 1;
-      }
-            
-      let id = `${itemType}_${next}`;
-      
-      if (itemType === 'field') {
         id = `${this.parentId}_${id}`;
       }
-    
+
       params.id = id;
-      
+
       let objectArrays = wizardSchema[itemType].objectArrays;
       if (objectArrays) {
-        Object.keys(objectArrays).forEach(objectType => {
+        Object.keys(objectArrays).forEach((objectType) => {
           params[objectArrays[objectType].property] = A();
         });
-      };
+      }
-          
+
       const newItem = EmberObject.create(params);
       items.pushObject(newItem);
-      
+
-      this.set('current', newItem);
+      this.set("current", newItem);
+    },
+
+    back(item) {
+      this.updateItemOrder(item.id, item.index - 1);
+    },
+
+    forward(item) {
+      this.updateItemOrder(item.id, item.index + 1);
     },
 
     change(itemId) {
-      this.set('current', this.items.findBy('id', itemId));
+      this.set("current", this.items.findBy("id", itemId));
     },
 
     remove(itemId) {
       const items = this.items;
       let item;
       let index;
-            
+
       items.forEach((it, ind) => {
         if (it.id === itemId) {
           item = it;
           index = ind;
         }
       });
-      
+
       let nextIndex;
       if (this.current.id === itemId) {
-        nextIndex = index < (items.length-2) ? (index+1) : (index-1);
+        nextIndex = index < items.length - 2 ? index + 1 : index - 1;
       }
-      
+
       items.removeObject(item);
-      
+
       if (nextIndex) {
-        this.set('current', items[nextIndex]);
+        this.set("current", items[nextIndex]);
       }
-    }
+    },
-  }
+  },
 });

assets/javascripts/discourse/components/wizard-mapper-connector.js.es6

@@ -1,35 +1,38 @@
 import Component from "@ember/component";
-import { gt } from '@ember/object/computed';
+import { gt } from "@ember/object/computed";
 import { computed } from "@ember/object";
-import { defaultConnector } from '../lib/wizard-mapper';
+import { defaultConnector } from "../lib/wizard-mapper";
 import { later } from "@ember/runloop";
-import { observes } from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
-  classNameBindings: [':mapper-connector', ':mapper-block', 'hasMultiple::single'],
+  classNameBindings: [
-  hasMultiple: gt('connectors.length', 1),
+    ":mapper-connector",
-  connectorLabel: computed(function() {
+    ":mapper-block",
+    "hasMultiple::single",
+  ],
+  hasMultiple: gt("connectors.length", 1),
+  connectorLabel: computed(function () {
     let key = this.connector;
     let path = this.inputTypes ? `input.${key}.name` : `connector.${key}`;
     return I18n.t(`admin.wizard.${path}`);
   }),
-  
+
   didReceiveAttrs() {
     if (!this.connector) {
       later(() => {
         this.set(
-          'connector',
+          "connector",
           defaultConnector(this.connectorType, this.inputType, this.options)
         );
-      });  
+      });
     }
   },
-  
+
   actions: {
     changeConnector(value) {
-      this.set('connector', value);
+      this.set("connector", value);
-      this.onUpdate('connector', this.connectorType);
+      this.onUpdate("connector", this.connectorType);
-    }
+    },
-  }
+  },
-});
+});

assets/javascripts/discourse/components/wizard-mapper-input.js.es6

@@ -1,69 +1,78 @@
 import { computed, set } from "@ember/object";
-import { alias, equal, or, not } from "@ember/object/computed";
+import { alias, equal, not, or } from "@ember/object/computed";
-import { newPair, connectorContent, inputTypesContent, defaultSelectionType, defaultConnector } from '../lib/wizard-mapper';
+import {
+  connectorContent,
+  defaultConnector,
+  defaultSelectionType,
+  inputTypesContent,
+  newPair,
+} from "../lib/wizard-mapper";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
 import { A } from "@ember/array";
 
 export default Component.extend({
-  classNameBindings: [':mapper-input', 'inputType'],
+  classNameBindings: [":mapper-input", "inputType"],
-  inputType: alias('input.type'),
+  inputType: alias("input.type"),
-  isConditional: equal('inputType', 'conditional'),
+  isConditional: equal("inputType", "conditional"),
-  isAssignment: equal('inputType', 'assignment'),
+  isAssignment: equal("inputType", "assignment"),
-  isAssociation: equal('inputType', 'association'),
+  isAssociation: equal("inputType", "association"),
-  isValidation: equal('inputType', 'validation'),
+  isValidation: equal("inputType", "validation"),
-  hasOutput: or('isConditional', 'isAssignment'),
+  hasOutput: or("isConditional", "isAssignment"),
-  hasPairs: or('isConditional', 'isAssociation', 'isValidation'),
+  hasPairs: or("isConditional", "isAssociation", "isValidation"),
-  canAddPair: not('isAssignment'),
+  canAddPair: not("isAssignment"),
-  connectors: computed(function() { return connectorContent('output', this.input.type, this.options) }),
+  connectors: computed(function () {
-  inputTypes: computed(function() { return inputTypesContent(this.options) }),
+    return connectorContent("output", this.input.type, this.options);
-  
+  }),
-  @observes('input.type')
+  inputTypes: computed(function () {
+    return inputTypesContent(this.options);
+  }),
+
+  @observes("input.type")
   setupType() {
     if (this.hasPairs && (!this.input.pairs || this.input.pairs.length < 1)) {
-      this.send('addPair');
+      this.send("addPair");
     }
-    
+
     if (this.hasOutput) {
-      this.set('input.output', null);
+      this.set("input.output", null);
-      
+
       if (!this.input.outputConnector) {
         const options = this.options;
-        this.set('input.output_type', defaultSelectionType('output', options));
+        this.set("input.output_type", defaultSelectionType("output", options));
-        this.set('input.output_connector', defaultConnector('output', this.inputType, options));
+        this.set(
+          "input.output_connector",
+          defaultConnector("output", this.inputType, options)
+        );
       }
     }
   },
-    
+
   actions: {
     addPair() {
       if (!this.input.pairs) {
-        this.set('input.pairs', A());
+        this.set("input.pairs", A());
       }
-      
+
       const pairs = this.input.pairs;
       const pairCount = pairs.length + 1;
-            
+
-      pairs.forEach(p => (set(p, 'pairCount', pairCount)));
+      pairs.forEach((p) => set(p, "pairCount", pairCount));
-      
+
       pairs.pushObject(
         newPair(
-          this.input.type, 
+          this.input.type,
-          Object.assign(
+          Object.assign({}, this.options, { index: pairs.length, pairCount })
-            {},
-            this.options,
-            { index: pairs.length, pairCount }
-          )
         )
       );
     },
-    
+
     removePair(pair) {
       const pairs = this.input.pairs;
       const pairCount = pairs.length - 1;
-      
+
-      pairs.forEach(p => (set(p, 'pairCount', pairCount)));
+      pairs.forEach((p) => set(p, "pairCount", pairCount));
       pairs.removeObject(pair);
-    }
+    },
-  }
+  },
 });

assets/javascripts/discourse/components/wizard-mapper-pair.js.es6

@@ -1,12 +1,16 @@
-import { connectorContent } from '../lib/wizard-mapper';
+import { connectorContent } from "../lib/wizard-mapper";
-import { gt, or, alias } from "@ember/object/computed";
+import { alias, gt } from "@ember/object/computed";
-import { computed, observes } from "@ember/object"; 
+import { computed } from "@ember/object";
 import Component from "@ember/component";
 
 export default Component.extend({
-  classNameBindings: [':mapper-pair', 'hasConnector::no-connector'],
+  classNameBindings: [":mapper-pair", "hasConnector::no-connector"],
-  firstPair: gt('pair.index', 0),
+  firstPair: gt("pair.index", 0),
-  showRemove: alias('firstPair'),
+  showRemove: alias("firstPair"),
-  showJoin: computed('pair.pairCount', function() { return this.pair.index < (this.pair.pairCount - 1) }),
+  showJoin: computed("pair.pairCount", function () {
-  connectors: computed(function() { return connectorContent('pair', this.inputType, this.options) })
+    return this.pair.index < this.pair.pairCount - 1;
-});
+  }),
+  connectors: computed(function () {
+    return connectorContent("pair", this.inputType, this.options);
+  }),
+});

assets/javascripts/discourse/components/wizard-mapper-selector-type.js.es6

@@ -1,14 +1,16 @@
-import discourseComputed from 'discourse-common/utils/decorators';
+import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 
 export default Component.extend({
-  tagName: 'a',
+  tagName: "a",
-  classNameBindings: ['active'],
+  classNameBindings: ["active"],
-  
+
-  @discourseComputed('item.type', 'activeType')
+  @discourseComputed("item.type", "activeType")
-  active(type, activeType) { return type === activeType },
+  active(type, activeType) {
-  
+    return type === activeType;
+  },
+
   click() {
-    this.toggle(this.item.type)
+    this.toggle(this.item.type);
-  }
+  },
-})
+});

assets/javascripts/discourse/components/wizard-mapper-selector.js.es6

@@ -1,51 +1,179 @@
-import { alias, or, gt } from "@ember/object/computed";
+import { alias, gt, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
-import { default as discourseComputed, observes, on } from "discourse-common/utils/decorators";
+import {
-import { getOwner } from 'discourse-common/lib/get-owner';
+  default as discourseComputed,
-import { defaultSelectionType, selectionTypes } from '../lib/wizard-mapper';
+  observes,
-import { snakeCase, generateName, userProperties } from '../lib/wizard';
+} from "discourse-common/utils/decorators";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
+import {
+  generateName,
+  sentenceCase,
+  snakeCase,
+  userProperties,
+} from "../lib/wizard";
 import Component from "@ember/component";
 import { bind, later } from "@ember/runloop";
 import I18n from "I18n";
+import Subscription from "../mixins/subscription";
 
-export default Component.extend({
+const customFieldActionMap = {
-  classNameBindings: [':mapper-selector', 'activeType'],
+  topic: ["create_topic", "send_message"],
-  
+  post: ["create_topic", "send_message"],
-  showText: computed('activeType', function() { return this.showInput('text') }),
+  category: ["create_category"],
-  showWizardField: computed('activeType', function() { return this.showInput('wizardField') }),
+  group: ["create_group"],
-  showWizardAction: computed('activeType', function() { return this.showInput('wizardAction') }),
+  user: ["update_profile"],
-  showUserField: computed('activeType', function() { return this.showInput('userField') }),
+};
-  showUserFieldOptions: computed('activeType', function() { return this.showInput('userFieldOptions') }),
+
-  showCategory: computed('activeType', function() { return this.showInput('category') }),
+const values = ["present", "true", "false"];
-  showTag: computed('activeType', function() { return this.showInput('tag') }),
+
-  showGroup: computed('activeType', function() { return this.showInput('group') }),
+export default Component.extend(Subscription, {
-  showUser: computed('activeType', function() { return this.showInput('user') }),
+  classNameBindings: [":mapper-selector", "activeType"],
-  showList: computed('activeType', function() { return this.showInput('list') }),
+
-  showCustomField: computed('activeType', function() { return this.showInput('customField') }),
+  showText: computed("activeType", function () {
-  textEnabled: computed('options.textSelection', 'inputType', function() { return this.optionEnabled('textSelection') }),
+    return this.showInput("text");
-  wizardFieldEnabled: computed('options.wizardFieldSelection', 'inputType', function() { return this.optionEnabled('wizardFieldSelection') }),
+  }),
-  wizardActionEnabled: computed('options.wizardActionSelection', 'inputType', function() { return this.optionEnabled('wizardActionSelection') }),
+  showWizardField: computed("activeType", function () {
-  customFieldEnabled: computed('options.customFieldSelection', 'inputType', function() { return this.optionEnabled('customFieldSelection') }),
+    return this.showInput("wizardField");
-  userFieldEnabled: computed('options.userFieldSelection', 'inputType', function() { return this.optionEnabled('userFieldSelection') }),
+  }),
-  userFieldOptionsEnabled: computed('options.userFieldOptionsSelection', 'inputType', function() { return this.optionEnabled('userFieldOptionsSelection') }),
+  showWizardAction: computed("activeType", function () {
-  categoryEnabled: computed('options.categorySelection', 'inputType', function() { return this.optionEnabled('categorySelection') }),
+    return this.showInput("wizardAction");
-  tagEnabled: computed('options.tagSelection', 'inputType', function() { return this.optionEnabled('tagSelection') }),
+  }),
-  groupEnabled: computed('options.groupSelection', 'inputType', function() { return this.optionEnabled('groupSelection') }),
+  showUserField: computed("activeType", function () {
-  userEnabled: computed('options.userSelection', 'inputType', function() { return this.optionEnabled('userSelection') }),
+    return this.showInput("userField");
-  listEnabled: computed('options.listSelection', 'inputType', function() { return this.optionEnabled('listSelection') }),
+  }),
-  
+  showUserFieldOptions: computed("activeType", function () {
-  groups: alias('site.groups'),
+    return this.showInput("userFieldOptions");
-  categories: alias('site.categories'),
+  }),
-  showComboBox: or('showWizardField', 'showWizardAction', 'showUserField', 'showUserFieldOptions', 'showCustomField'),
+  showCategory: computed("activeType", function () {
-  showMultiSelect: or('showCategory', 'showGroup'),
+    return this.showInput("category");
-  hasTypes: gt('selectorTypes.length', 1),
+  }),
+  showTag: computed("activeType", function () {
+    return this.showInput("tag");
+  }),
+  showGroup: computed("activeType", function () {
+    return this.showInput("group");
+  }),
+  showUser: computed("activeType", function () {
+    return this.showInput("user");
+  }),
+  showList: computed("activeType", function () {
+    return this.showInput("list");
+  }),
+  showCustomField: computed("activeType", function () {
+    return this.showInput("customField");
+  }),
+  showValue: computed("activeType", function () {
+    return this.showInput("value");
+  }),
+  textEnabled: computed("options.textSelection", "inputType", function () {
+    return this.optionEnabled("textSelection");
+  }),
+  wizardFieldEnabled: computed(
+    "options.wizardFieldSelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("wizardFieldSelection");
+    }
+  ),
+  wizardActionEnabled: computed(
+    "options.wizardActionSelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("wizardActionSelection");
+    }
+  ),
+  customFieldEnabled: computed(
+    "options.customFieldSelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("customFieldSelection");
+    }
+  ),
+  userFieldEnabled: computed(
+    "options.userFieldSelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("userFieldSelection");
+    }
+  ),
+  userFieldOptionsEnabled: computed(
+    "options.userFieldOptionsSelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("userFieldOptionsSelection");
+    }
+  ),
+  categoryEnabled: computed(
+    "options.categorySelection",
+    "inputType",
+    function () {
+      return this.optionEnabled("categorySelection");
+    }
+  ),
+  tagEnabled: computed("options.tagSelection", "inputType", function () {
+    return this.optionEnabled("tagSelection");
+  }),
+  groupEnabled: computed("options.groupSelection", "inputType", function () {
+    return this.optionEnabled("groupSelection");
+  }),
+  guestGroup: computed("options.guestGroup", "inputType", function () {
+    return this.optionEnabled("guestGroup");
+  }),
+  userEnabled: computed("options.userSelection", "inputType", function () {
+    return this.optionEnabled("userSelection");
+  }),
+  listEnabled: computed("options.listSelection", "inputType", function () {
+    return this.optionEnabled("listSelection");
+  }),
+  valueEnabled: computed("connector", function () {
+    return this.connector === "is";
+  }),
+
+  @discourseComputed("site.groups", "guestGroup", "subscriptionType")
+  groups(groups, guestGroup, subscriptionType) {
+    let result = groups;
+    if (!guestGroup) {
+      return result;
+    }
+
+    if (["standard", "business"].includes(subscriptionType)) {
+      let guestIndex;
+      result.forEach((r, index) => {
+        if (r.id === 0) {
+          r.name = I18n.t("admin.wizard.selector.label.users");
+          guestIndex = index;
+        }
+      });
+      result.splice(guestIndex, 0, {
+        id: -1,
+        name: I18n.t("admin.wizard.selector.label.guests"),
+      });
+    }
+
+    return result;
+  },
+  categories: alias("site.categories"),
+  showComboBox: or(
+    "showWizardField",
+    "showWizardAction",
+    "showUserField",
+    "showUserFieldOptions",
+    "showCustomField",
+    "showValue"
+  ),
+  showMultiSelect: or("showCategory", "showGroup"),
+  hasTypes: gt("selectorTypes.length", 1),
   showTypes: false,
-  
+
   didInsertElement() {
-    if (!this.activeType || (this.activeType && !this[`${this.activeType}Enabled`])) {
+    if (
+      !this.activeType ||
+      (this.activeType && !this[`${this.activeType}Enabled`])
+    ) {
       later(() => this.resetActiveType());
     }
-    
+
     $(document).on("click", bind(this, this.documentClick));
   },
 
@@ -54,44 +182,49 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state == "destroying") return;
+    if (this._state === "destroying") {
+      return;
+    }
     let $target = $(e.target);
-        
+
-    if (!$target.parents('.type-selector').length && this.showTypes) {
+    if (!$target.parents(".type-selector").length && this.showTypes) {
-      this.set('showTypes', false);
+      this.set("showTypes", false);
     }
   },
-  
+
-  @discourseComputed
+  @discourseComputed("connector")
   selectorTypes() {
-    return selectionTypes.filter(type => (this[`${type}Enabled`]))
+    return selectionTypes
-      .map(type => ({ type, label: this.typeLabel(type) }));
+      .filter((type) => this[`${type}Enabled`])
+      .map((type) => ({ type, label: this.typeLabel(type) }));
   },
-  
+
-  @discourseComputed('activeType')
+  @discourseComputed("activeType")
   activeTypeLabel(activeType) {
     return this.typeLabel(activeType);
   },
-  
+
   typeLabel(type) {
-    return type ? I18n.t(`admin.wizard.selector.label.${snakeCase(type)}`) : null;
+    return type
+      ? I18n.t(`admin.wizard.selector.label.${snakeCase(type)}`)
+      : null;
   },
-  
+
-  comboBoxAllowAny: or('showWizardField', 'showWizardAction'),
+  comboBoxAllowAny: or("showWizardField", "showWizardAction"),
-  
+
   @discourseComputed
   showController() {
-    return getOwner(this).lookup('controller:admin-wizards-wizard-show');
+    return getOwner(this).lookup("controller:admin-wizards-wizard-show");
   },
-  
+
   @discourseComputed(
-    'activeType',
+    "activeType",
-    'showController.wizardFields.[]',
+    "showController.wizardFields.[]",
-    'showController.wizard.actions.[]',
+    "showController.wizard.actions.[]",
-    'showController.userFields.[]',
+    "showController.userFields.[]",
-    'showController.currentField.id',
+    "showController.currentField.id",
-    'showController.currentAction.id',
+    "showController.currentAction.id",
-    'showController.customFields'
+    "showController.customFields"
   )
   comboBoxContent(
     activeType,
@@ -103,133 +236,175 @@ export default Component.extend({
     customFields
   ) {
     let content;
-    
+    let context;
-    if (activeType === 'wizardField') {
+    let contextType;
+
+    if (this.options.context) {
+      let contextAttrs = this.options.context.split(".");
+      context = contextAttrs[0];
+      contextType = contextAttrs[1];
+    }
+
+    if (activeType === "wizardField") {
       content = wizardFields;
-      
+
-      if (this.options.context === 'field') {
+      if (context === "field") {
-        content = content.filter(field => field.id !== currentFieldId);
+        content = content.filter((field) => field.id !== currentFieldId);
       }
     }
-    
+
-    if (activeType === 'wizardAction') {
+    if (activeType === "wizardAction") {
-      content = wizardActions.map(a => ({
+      content = wizardActions.map((a) => ({
         id: a.id,
         label: `${generateName(a.type)} (${a.id})`,
-        type: a.type
+        type: a.type,
       }));
-            
+
-      if (this.options.context === 'action') {
+      if (context === "action") {
-        content = content.filter(a => a.id !== currentActionId);
+        content = content.filter((a) => a.id !== currentActionId);
       }
     }
-    
+
-    if (activeType === 'userField') {
+    if (activeType === "userField") {
-      content = userProperties.map((f) => ({
+      content = userProperties
-        id: f,
+        .map((f) => ({
-        name: generateName(f)
+          id: f,
-      })).concat((userFields || []));
+          name: generateName(f),
-      
+        }))
-      if (this.options.context === 'action' &&
+        .concat(userFields || []);
-          this.inputType === 'association' &&
+
-          this.selectorType === 'key') {
+      if (
-        
+        context === "action" &&
-        const excludedFields = ['username','email', 'trust_level'];
+        this.inputType === "association" &&
-        content = content.filter(userField => excludedFields.indexOf(userField.id) === -1);  
+        this.selectorType === "key"
+      ) {
+        const excludedFields = ["username", "email", "trust_level"];
+        content = content.filter(
+          (userField) => excludedFields.indexOf(userField.id) === -1
+        );
       }
     }
-    
+
-    if (activeType === 'userFieldOptions') {
+    if (activeType === "userFieldOptions") {
       content = userFields;
     }
-    
+
-    if (activeType === 'customField') {
+    if (activeType === "customField") {
-      content = customFields;
+      content = customFields
+        .filter((f) => {
+          return (
+            f.type !== "json" &&
+            customFieldActionMap[f.klass].includes(contextType)
+          );
+        })
+        .map((f) => ({
+          id: f.name,
+          name: `${sentenceCase(f.klass)} ${f.name} (${f.type})`,
+        }));
     }
-    
+
+    if (activeType === "value") {
+      content = values.map((value) => ({
+        id: value,
+        name: value,
+      }));
+    }
+
     return content;
   },
-  
+
-  @discourseComputed('activeType')
+  @discourseComputed("activeType")
   multiSelectContent(activeType) {
     return {
       category: this.categories,
       group: this.groups,
-      list: ''
+      list: "",
     }[activeType];
   },
-  
+
-  @discourseComputed('activeType', 'inputType')
+  @discourseComputed("activeType", "inputType")
-  placeholderKey(activeType, inputType) {
+  placeholderKey(activeType) {
-    if (activeType === 'text' && this.options[`${this.selectorType}Placeholder`]) {
+    if (
+      activeType === "text" &&
+      this.options[`${this.selectorType}Placeholder`]
+    ) {
       return this.options[`${this.selectorType}Placeholder`];
     } else {
       return `admin.wizard.selector.placeholder.${snakeCase(activeType)}`;
-    }  
+    }
   },
-  
+
-  @discourseComputed('activeType')
+  @discourseComputed("activeType")
   multiSelectOptions(activeType) {
     let result = {
-      none: this.placeholderKey
+      none: this.placeholderKey,
     };
-    
+
-    if (activeType === 'list') {
+    if (activeType === "list") {
       result.allowAny = true;
     }
-    
+
     return result;
   },
-  
+
   optionEnabled(type) {
     const options = this.options;
-    if (!options) return false;
+    if (!options) {
-    
+      return false;
+    }
+
     const option = options[type];
-    if (option === true) return true;
+    if (option === true) {
-    if (typeof option !== 'string') return false;
+      return true;
-            
+    }
-    return option.split(',').filter(option => {
+    if (typeof option !== "string") {
-      return [this.selectorType, this.inputType].indexOf(option) !== -1;
+      return false;
+    }
+
+    return option.split(",").filter((o) => {
+      return [this.selectorType, this.inputType].indexOf(o) !== -1;
     }).length;
   },
-  
+
   showInput(type) {
     return this.activeType === type && this[`${type}Enabled`];
   },
-  
+
   changeValue(value) {
-    this.set('value', value);
+    this.set("value", value);
-    this.onUpdate('selector', this.activeType);
+    this.onUpdate("selector", this.activeType);
   },
-  
+
-  @observes('inputType')
+  @observes("inputType")
   resetActiveType() {
-    this.set('activeType', defaultSelectionType(this.selectorType, this.options));
+    this.set(
+      "activeType",
+      defaultSelectionType(this.selectorType, this.options, this.connector)
+    );
   },
-  
+
   actions: {
     toggleType(type) {
-      this.set('activeType', type);
+      this.set("activeType", type);
-      this.set('showTypes', false);
+      this.set("showTypes", false);
-      this.set('value', null);
+      this.set("value", null);
-      this.onUpdate('selector');
+      this.onUpdate("selector");
     },
-    
+
     toggleTypes() {
-      this.toggleProperty('showTypes');
+      this.toggleProperty("showTypes");
     },
-    
+
     changeValue(value) {
       this.changeValue(value);
     },
-    
+
     changeInputValue(event) {
       this.changeValue(event.target.value);
     },
-    
+
-    changeUserValue(previousValue, value) {
+    changeUserValue(value) {
       this.changeValue(value);
-    }
+    },
-  }
+  },
-})
+});

assets/javascripts/discourse/components/wizard-mapper.js.es6

@@ -1,84 +1,86 @@
-import { getOwner } from 'discourse-common/lib/get-owner';
+import { newInput, selectionTypes } from "../lib/wizard-mapper";
-import { newInput, selectionTypes } from '../lib/wizard-mapper';
+import discourseComputed from "discourse-common/utils/decorators";
-import { default as discourseComputed, observes, on } from 'discourse-common/utils/decorators';
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { A } from "@ember/array";
 
 export default Component.extend({
-  classNames: 'wizard-mapper',
+  classNames: "wizard-mapper",
-  
+
   didReceiveAttrs() {
     if (this.inputs && this.inputs.constructor !== Array) {
-      later(() => this.set('inputs', null));
+      later(() => this.set("inputs", null));
     }
   },
-  
+
-  @discourseComputed('inputs.@each.type')
+  @discourseComputed("inputs.@each.type")
   canAdd(inputs) {
-    return !inputs ||
+    return (
-           inputs.constructor !== Array ||
+      !inputs ||
-           inputs.every(i => {
+      inputs.constructor !== Array ||
-             return ['assignment','association'].indexOf(i.type) === -1;
+      inputs.every((i) => {
-           });
+        return ["assignment", "association"].indexOf(i.type) === -1;
+      })
+    );
   },
-  
+
-  @discourseComputed('options.@each.inputType')
+  @discourseComputed("options.@each.inputType")
   inputOptions(options) {
     let result = {
-      inputTypes: options.inputTypes || 'assignment,conditional',
+      inputTypes: options.inputTypes || "assignment,conditional",
-      inputConnector: options.inputConnector || 'or',
+      inputConnector: options.inputConnector || "or",
       pairConnector: options.pairConnector || null,
       outputConnector: options.outputConnector || null,
-      context: options.context || null
+      context: options.context || null,
-    }
+      guestGroup: options.guestGroup || false,
-        
+    };
-    let inputTypes = ['key', 'value', 'output'];
+
-    inputTypes.forEach(type => {
+    let inputTypes = ["key", "value", "output"];
+    inputTypes.forEach((type) => {
       result[`${type}Placeholder`] = options[`${type}Placeholder`] || null;
-      result[`${type}DefaultSelection`] = options[`${type}DefaultSelection`] || null;
+      result[`${type}DefaultSelection`] =
+        options[`${type}DefaultSelection`] || null;
     });
-    
+
-    selectionTypes.forEach(type => {
+    selectionTypes.forEach((type) => {
       if (options[`${type}Selection`] !== undefined) {
-        result[`${type}Selection`] = options[`${type}Selection`]
+        result[`${type}Selection`] = options[`${type}Selection`];
       } else {
-        result[`${type}Selection`] = type === 'text' ? true : false;
+        result[`${type}Selection`] = type === "text" ? true : false;
       }
     });
-                    
+
     return result;
   },
-  
+
-  onUpdate() {
+  onUpdate() {},
-  },
 
   actions: {
     add() {
-      if (!this.get('inputs')) {
+      if (!this.get("inputs")) {
-        this.set('inputs', A());
+        this.set("inputs", A());
       }
 
-      this.get('inputs').pushObject(
+      this.get("inputs").pushObject(
         newInput(this.inputOptions, this.inputs.length)
       );
-      
+
-      this.onUpdate(this.property, 'input');
+      this.onUpdate(this.property, "input");
     },
 
     remove(input) {
       const inputs = this.inputs;
       inputs.removeObject(input);
-            
+
       if (inputs.length) {
-        inputs[0].set('connector', null);
+        inputs[0].set("connector", null);
       }
-      
+
-      this.onUpdate(this.property, 'input');
+      this.onUpdate(this.property, "input");
     },
-    
+
     inputUpdated(component, type) {
       this.onUpdate(this.property, component, type);
-    }
+    },
-  }
+  },
 });

assets/javascripts/discourse/components/wizard-message.js.es6

@@ -1,32 +1,33 @@
-import { default as discourseComputed } from 'discourse-common/utils/decorators';
+import { default as discourseComputed } from "discourse-common/utils/decorators";
 import { not, notEmpty } from "@ember/object/computed";
 import Component from "@ember/component";
 import I18n from "I18n";
 
 const icons = {
-  error: 'times-circle',
+  error: "times-circle",
-  success: 'check-circle',
+  success: "check-circle",
-  info: 'info-circle'
+  warn: "exclamation-circle",
-}
+  info: "info-circle",
+};
 
 export default Component.extend({
-  classNameBindings: [':wizard-message', 'type', 'loading'],
+  classNameBindings: [":wizard-message", "type", "loading"],
-  showDocumentation: not('loading'),
+  showDocumentation: not("loading"),
-  showIcon: not('loading'),
+  showIcon: not("loading"),
-  hasItems: notEmpty('items'),
+  hasItems: notEmpty("items"),
-  
+
-  @discourseComputed('type')
+  @discourseComputed("type")
   icon(type) {
-    return icons[type] || 'info-circle';
+    return icons[type] || "info-circle";
   },
-  
+
-  @discourseComputed('key', 'component', 'opts')
+  @discourseComputed("key", "component", "opts")
   message(key, component, opts) {
     return I18n.t(`admin.wizard.message.${component}.${key}`, opts || {});
   },
-  
+
-  @discourseComputed('component')
+  @discourseComputed("component")
   documentation(component) {
     return I18n.t(`admin.wizard.message.${component}.documentation`);
-  }
+  },
-})
+});

assets/javascripts/discourse/components/wizard-realtime-validations.js.es6

@@ -6,29 +6,27 @@ import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
-  classNames: ["realtime-validations"],
+  classNames: ["realtime-validations", "setting", "full", "subscription"],
+
   @discourseComputed
   timeUnits() {
-    return [
+    return ["days", "weeks", "months", "years"].map((unit) => {
-      "days",
+      return {
-      "weeks",
+        id: unit,
-      "months",
+        name: I18n.t(`admin.wizard.field.validations.time_units.${unit}`),
-      "years"
+      };
-    ].map((unit) => {
+    });
-        return {
-          id: unit,
-          name: I18n.t(`admin.wizard.field.validations.time_units.${unit}`)
-        }
-      });
   },
 
   init() {
     this._super(...arguments);
-    if (!this.validations) return;
+    if (!this.validations) {
+      return;
+    }
 
     if (!this.field.validations) {
       const validations = {};
-      
+
       this.validations.forEach((validation) => {
         validations[validation] = {};
       });

assets/javascripts/discourse/components/wizard-subscription-badge.js.es6

@@ -0,0 +1,30 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+import DiscourseURL from "discourse/lib/url";
+import I18n from "I18n";
+
+export default Component.extend(Subscription, {
+  tagName: "a",
+  classNameBindings: [":wizard-subscription-badge", "subscriptionType"],
+  attributeBindings: ["title"],
+
+  @discourseComputed("subscriptionType")
+  i18nKey(type) {
+    return `admin.wizard.subscription.type.${type ? type : "none"}`;
+  },
+
+  @discourseComputed("i18nKey")
+  title(i18nKey) {
+    return I18n.t(`${i18nKey}.title`);
+  },
+
+  @discourseComputed("i18nKey")
+  label(i18nKey) {
+    return I18n.t(`${i18nKey}.label`);
+  },
+
+  click() {
+    DiscourseURL.routeTo(this.subscriptionLink);
+  },
+});

assets/javascripts/discourse/components/wizard-subscription-container.js.es6

@@ -0,0 +1,26 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+
+export default Component.extend(Subscription, {
+  classNameBindings: [":wizard-subscription-container", "subscribed"],
+
+  @discourseComputed("subscribed")
+  subscribedIcon(subscribed) {
+    return subscribed ? "check" : "times";
+  },
+
+  @discourseComputed("subscribed")
+  subscribedLabel(subscribed) {
+    return `admin.wizard.subscription.${
+      subscribed ? "subscribed" : "not_subscribed"
+    }.label`;
+  },
+
+  @discourseComputed("subscribed")
+  subscribedTitle(subscribed) {
+    return `admin.wizard.subscription.${
+      subscribed ? "subscribed" : "not_subscribed"
+    }.title`;
+  },
+});

assets/javascripts/discourse/components/wizard-subscription-cta.js.es6

@@ -0,0 +1,36 @@
+import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
+import Subscription from "../mixins/subscription";
+import I18n from "I18n";
+
+export default Component.extend(Subscription, {
+  tagName: "a",
+  classNameBindings: [":btn", ":btn-pavilion-support", "subscriptionType"],
+  attributeBindings: ["title"],
+
+  @discourseComputed("subscribed")
+  i18nKey(subscribed) {
+    return `admin.wizard.subscription.cta.${
+      subscribed ? "subscribed" : "none"
+    }`;
+  },
+
+  @discourseComputed("subscribed")
+  icon(subscribed) {
+    return subscribed ? "far-life-ring" : "external-link-alt";
+  },
+
+  @discourseComputed("i18nKey")
+  title(i18nKey) {
+    return I18n.t(`${i18nKey}.title`);
+  },
+
+  @discourseComputed("i18nKey")
+  label(i18nKey) {
+    return I18n.t(`${i18nKey}.label`);
+  },
+
+  click() {
+    window.open(this.subscriptionCtaLink, "_blank").focus();
+  },
+});

assets/javascripts/discourse/components/wizard-subscription-selector.js.es6

@@ -0,0 +1,96 @@
+import SingleSelectComponent from "select-kit/components/single-select";
+import Subscription from "../mixins/subscription";
+import { filterValues } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
+
+const nameKey = function (feature, attribute, value) {
+  if (feature === "action") {
+    return `admin.wizard.action.${value}.label`;
+  } else {
+    return `admin.wizard.${feature}.${attribute}.${value}`;
+  }
+};
+
+export default SingleSelectComponent.extend(Subscription, {
+  classNames: ["combo-box", "wizard-subscription-selector"],
+
+  selectKitOptions: {
+    autoFilterable: false,
+    filterable: false,
+    showFullTitle: true,
+    headerComponent:
+      "wizard-subscription-selector/wizard-subscription-selector-header",
+    caretUpIcon: "caret-up",
+    caretDownIcon: "caret-down",
+  },
+
+  allowedSubscriptionTypes(feature, attribute, value) {
+    let attributes = this.subscriptionAttributes[feature];
+    if (!attributes || !attributes[attribute]) {
+      return ["none"];
+    }
+    let allowedTypes = [];
+    Object.keys(attributes[attribute]).forEach((subscriptionType) => {
+      let values = attributes[attribute][subscriptionType];
+      if (values[0] === "*" || values.includes(value)) {
+        allowedTypes.push(subscriptionType);
+      }
+    });
+    return allowedTypes;
+  },
+
+  @discourseComputed("feature", "attribute", "wizard.allowGuests")
+  content(feature, attribute) {
+    return filterValues(this.wizard, feature, attribute)
+      .map((value) => {
+        let allowedSubscriptionTypes = this.allowedSubscriptionTypes(
+          feature,
+          attribute,
+          value
+        );
+
+        let subscriptionRequired =
+          allowedSubscriptionTypes.length &&
+          !allowedSubscriptionTypes.includes("none");
+
+        let attrs = {
+          id: value,
+          name: I18n.t(nameKey(feature, attribute, value)),
+          subscriptionRequired,
+        };
+
+        if (subscriptionRequired) {
+          let subscribed = allowedSubscriptionTypes.includes(
+            this.subscriptionType
+          );
+          let selectorKey = subscribed ? "subscribed" : "not_subscribed";
+          let selectorLabel = `admin.wizard.subscription.${selectorKey}.selector`;
+
+          attrs.disabled = !subscribed;
+          attrs.selectorLabel = selectorLabel;
+        }
+
+        return attrs;
+      })
+      .sort(function (a, b) {
+        if (a.subscriptionType && !b.subscriptionType) {
+          return 1;
+        }
+        if (!a.subscriptionType && b.subscriptionType) {
+          return -1;
+        }
+        if (a.subscriptionType === b.subscriptionType) {
+          return a.subscriptionType
+            ? a.subscriptionType.localeCompare(b.subscriptionType)
+            : 0;
+        } else {
+          return a.subscriptionType === "standard" ? -1 : 0;
+        }
+      });
+  },
+
+  modifyComponentForRow() {
+    return "wizard-subscription-selector/wizard-subscription-selector-row";
+  },
+});

assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6

@@ -0,0 +1,17 @@
+import SingleSelectHeaderComponent from "select-kit/components/select-kit/single-select-header";
+import { computed } from "@ember/object";
+import { reads } from "@ember/object/computed";
+
+export default SingleSelectHeaderComponent.extend({
+  classNames: ["combo-box-header", "wizard-subscription-selector-header"],
+  caretUpIcon: reads("selectKit.options.caretUpIcon"),
+  caretDownIcon: reads("selectKit.options.caretDownIcon"),
+  caretIcon: computed(
+    "selectKit.isExpanded",
+    "caretUpIcon",
+    "caretDownIcon",
+    function () {
+      return this.selectKit.isExpanded ? this.caretUpIcon : this.caretDownIcon;
+    }
+  ),
+});

assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6

@@ -0,0 +1,20 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
+
+export default SelectKitRowComponent.extend({
+  classNameBindings: ["isDisabled:disabled"],
+
+  @discourseComputed("item")
+  isDisabled() {
+    return this.item.disabled;
+  },
+
+  click(event) {
+    event.preventDefault();
+    event.stopPropagation();
+    if (!this.item.disabled) {
+      this.selectKit.select(this.rowValue, this.item);
+    }
+    return false;
+  },
+});