MERGE: main into stable for 3.0.x

2023-01-30 15:05:07 +00:00 · 2023-01-30 15:05:07 +00:00 · 22edf53cde
Commit 22edf53cde
--- a/.github/workflows/plugin-linting.yml
+++ b/.github/workflows/plugin-linting.yml
@ -3,54 +3,52 @@ name: Linting
 on:
  push:
    branches:
-      - master
      - main
      - stable
  pull_request:
-  schedule:
-    - cron: '0 0 * * *'
+
+concurrency:
+  group: plugin-linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  cancel-in-progress: true

 jobs:
  build:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Set up Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 14
+          node-version: 16
+          cache: yarn
+
+      - name: Yarn install
+        run: yarn install

      - name: Set up ruby
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: 2.7
-
-      - name: Setup bundler
-        run: gem install bundler -v 2.1.4 --no-doc
-
-      - name: Setup gems
-        run: bundle install --jobs 4
-
-      - name: Yarn install
-        run: yarn install --dev
+          bundler-cache: true

      - name: ESLint
+        if: ${{ always() }}
        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,assets}/javascripts

      - name: Prettier
+        if: ${{ always() }}
+        shell: bash
        run: |
          yarn prettier -v
-          if [ -d "assets" ]; then \
-            yarn prettier --list-different "assets/**/*.{scss,js,es6}" ; \
+          if [ 0 -lt $(find assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+            yarn prettier --list-different "assets/**/*.{scss,js,es6}"
          fi
-          if [ -d "test" ]; then \
-            yarn prettier --list-different "test/**/*.{js,es6}" ; \
+          if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+            yarn prettier --list-different "test/**/*.{js,es6}"
          fi

-      - name: Ember template lint
-        run: yarn ember-template-lint assets/javascripts
-
      - name: Rubocop
+        if: ${{ always() }}
        run: bundle exec rubocop .
--- a/.github/workflows/plugin-metadata.yml
+++ b/.github/workflows/plugin-metadata.yml
@ -36,9 +36,9 @@ jobs:
        uses: actions/github-script@v5
        with:
          script: |
-              const semver = require('semver');
-              const { head_version, base_version } = process.env;
+            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.");
-              }
+            if (semver.lte(head_version, base_version)) {
+              core.setFailed("Head version is equal to or lower than base version.");
+            }
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@ -3,24 +3,25 @@ name: Plugin Tests
 on:
  push:
    branches:
-      - stable
-      - master
      - main
+      - stable
  pull_request:
-  schedule:
-    - cron: '0 */12 * * *'
+
+concurrency:
+  group: tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  cancel-in-progress: true

 jobs:
  build:
    name: ${{ matrix.build_type }}
    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    container: discourse/discourse_test:slim${{ startsWith(matrix.build_type, 'frontend') && '-browsers' || '' }}
+    timeout-minutes: 30

    env:
      DISCOURSE_HOSTNAME: www.example.com
      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
      RAILS_ENV: test
-      PGHOST: localhost
      PGUSER: discourse
      PGPASSWORD: discourse

@ -29,121 +30,107 @@ jobs:

      matrix:
        build_type: ["backend", "frontend"]
-        ruby: ["2.7"]
-        postgres: ["12"]
-        redis: ["6.x"]
-
-    services:
-      postgres:
-        image: postgres:${{ matrix.postgres }}
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: discourse
-          POSTGRES_PASSWORD: discourse
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5

    steps:
-      - uses: haya14busa/action-cond@v1
-        id: discourse_branch
-        with:
-          cond: ${{  github.base_ref == 'stable' }}
-          if_true: "stable"
-          if_false: "tests-passed"
-
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          repository: discourse/discourse
-          ref: ${{ steps.discourse_branch.outputs.value }}
          fetch-depth: 1

-      - name: Fetch Repo Name
-        id: repo-name
-        run: echo "::set-output name=value::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-
      - name: Install plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
-          path: plugins/${{ steps.repo-name.outputs.value }}
-          ref: "${{ github.base_ref }}"
+          path: plugins/${{ github.event.repository.name }}
          fetch-depth: 1

-      - name: Check spec existence
-        id: check_spec
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ steps.repo-name.outputs.value }}/spec"
-
-      - name: Check qunit existence
-        id: check_qunit
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ steps.repo-name.outputs.value }}/test/javascripts"
-
      - name: Setup Git
        run: |
          git config --global user.email "ci@ci.invalid"
          git config --global user.name "Discourse CI"

-      - name: Setup packages
+      - name: Start redis
        run: |
-          sudo apt-get update
-          sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead
-          wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
+          redis-server /etc/redis/redis.conf &

-      - name: Update imagemagick
-        if: matrix.build_type == 'backend'
+      - name: Start Postgres
        run: |
-          wget https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-imagemagick
-          chmod +x install-imagemagick
-          sudo ./install-imagemagick
+          chown -R postgres /var/run/postgresql
+          sudo -E -u postgres script/start_test_db.rb
+          sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"

-      - name: Setup redis
-        uses: shogo82148/actions-setup-redis@v1
+      - name: Bundler cache
+        uses: actions/cache@v3
        with:
-          redis-version: ${{ matrix.redis }}
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gem-

-      - name: Setup ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+      - name: Setup gems
+        run: |
+          gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
+          bundle config --local path vendor/bundle
+          bundle config --local deployment true
+          bundle config --local without development
+          bundle install --jobs 4
+          bundle clean

      - name: Lint English locale
        if: matrix.build_type == 'backend'
-        run: bundle exec ruby script/i18n_lint.rb "plugins/${{ steps.repo-name.outputs.value }}/locales/{client,server}.en.yml"
+        run: bundle exec ruby script/i18n_lint.rb "plugins/${{ github.event.repository.name }}/locales/{client,server}.en.yml"

      - name: Get yarn cache directory
        id: yarn-cache-dir
        run: echo "::set-output name=dir::$(yarn cache dir)"

      - name: Yarn cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        id: yarn-cache
        with:
          path: ${{ steps.yarn-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
          restore-keys: |
-            ${{ runner.os }}-${{ matrix.os }}-yarn-
+            ${{ runner.os }}-yarn-

      - name: Yarn install
-        run: yarn install --dev
+        run: yarn install

-      - name: Migrate database
+      - name: Fetch app state cache
+        uses: actions/cache@v3
+        id: app-cache
+        with:
+          path: tmp/app-cache
+          key: >-
+            ${{ hashFiles('.github/workflows/tests.yml') }}-
+            ${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
+
+      - name: Restore database from cache
+        if: steps.app-cache.outputs.cache-hit == 'true'
+        run: psql -f tmp/app-cache/cache.sql postgres
+
+      - name: Restore uploads from cache
+        if: steps.app-cache.outputs.cache-hit == 'true'
+        run: rm -rf public/uploads && cp -r tmp/app-cache/uploads public/uploads
+
+      - name: Create and migrate database
+        if: steps.app-cache.outputs.cache-hit != 'true'
        run: |
          bin/rake db:create
          bin/rake db:migrate

-      - name: Plugin RSpec with Coverage
-        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true'
-        run: SIMPLECOV=1 bin/rake plugin:spec[${{ steps.repo-name.outputs.value }}]
+      - name: Dump database for cache
+        if: steps.app-cache.outputs.cache-hit != 'true'
+        run: mkdir -p tmp/app-cache && pg_dumpall > tmp/app-cache/cache.sql
+
+      - name: Dump uploads for cache
+        if: steps.app-cache.outputs.cache-hit != 'true'
+        run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
+
+      - name: Plugin RSpec
+        if: matrix.build_type == 'backend'
+        run: bin/rake plugin:spec[${{ github.event.repository.name }}]

      - name: Plugin QUnit
-        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true'
-        run: bundle exec rake plugin:qunit['${{ steps.repo-name.outputs.value }}','1200000']
-        timeout-minutes: 30
+        if: matrix.build_type == 'frontend'
+        run: QUNIT_EMBER_CLI=1 bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000']
+        timeout-minutes: 10
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,8 @@
 coverage/*
 !coverage/.last_run.json
-gems/
+gems/*
 .bundle/
 auto_generated
 .DS_Store
 node_modules/
+vendor/*
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -1,2 +1,8 @@
 inherit_gem:
  rubocop-discourse: default.yml
+
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false
--- a/.simplecov
+++ b/.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
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -2,31 +2,32 @@ GEM
  remote: https://rubygems.org/
  specs:
    ast (2.4.2)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    regexp_parser (2.6.0)
    rexml (3.2.5)
-    rubocop (1.12.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.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.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-discourse (2.4.1)
+    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.2.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.13.2)
+      rubocop (~> 1.33)
    ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.3.0)

 PLATFORMS
  ruby
--- a/README.md
+++ b/README.md
@ -1,3 +1,25 @@
-# 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">
+
+## 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://discourse.pluginmanager.org/c/discourse-custom-wizard/documentation), or go directly to the relevant section
+
+- [Wizard Administration](https://discourse.pluginmanager.org/t/wizard-administration)
+- [Wizard Settings](https://discourse.pluginmanager.org/t/wizard-settings)
+- [Step Settings](https://discourse.pluginmanager.org/t/step-settings)
+- [Field Settings](https://discourse.pluginmanager.org/t/field-settings)
+- [Conditional Settings](https://discourse.pluginmanager.org/t/conditional-settings)
+- [Field Interpolation](https://discourse.pluginmanager.org/t/field-interpolation)
+- [Wizard Examples and Templates](https://discourse.pluginmanager.org/t/wizard-examples-and-templates)
+
+## Support
+
+- [Report a bug](https://discourse.pluginmanager.org/w/bug-report)
--- a/SECURITY.md
+++ b/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.
--- a/app/controllers/custom_wizard/admin/admin.rb
+++ b/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: subcription.client_installed?
+    )
  end

  private
--- a/app/controllers/custom_wizard/admin/api.rb
+++ b/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
--- a/app/controllers/custom_wizard/admin/custom_fields.rb
+++ b/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
--- a/app/controllers/custom_wizard/admin/logs.rb
+++ b/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
--- a/app/controllers/custom_wizard/admin/manager.rb
+++ b/app/controllers/custom_wizard/admin/manager.rb
--- a/app/controllers/custom_wizard/admin/submissions.rb
+++ b/app/controllers/custom_wizard/admin/submissions.rb
@ -13,12 +13,16 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
  def show
    render_json_dump(
      wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
-      submissions: ActiveModel::ArraySerializer.new(ordered_submissions, each_serializer: CustomWizard::SubmissionSerializer)
+      submissions: ActiveModel::ArraySerializer.new(
+        submission_list.submissions,
+        each_serializer: CustomWizard::SubmissionSerializer
+      ),
+      total: submission_list.total
    )
  end

  def download
-    send_data ordered_submissions.to_json,
+    send_data submission_list.submissions.to_json,
      filename: "#{Discourse.current_hostname}-wizard-submissions-#{@wizard.name}.json",
      content_type: "application/json",
      disposition: "attachment"
@ -26,7 +30,7 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController

  protected

-  def ordered_submissions
-    CustomWizard::Submission.list(@wizard, order_by: 'id')
+  def submission_list
+    CustomWizard::Submission.list(@wizard, page: params[:page].to_i)
  end
 end
--- a/app/controllers/custom_wizard/admin/wizard.rb
+++ b/app/controllers/custom_wizard/admin/wizard.rb
@ -88,6 +88,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
        :title,
        :key,
        :banner,
+        :banner_upload_id,
        :raw_description,
        :required_data_message,
        :force_final,
@ -99,6 +100,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
          :index,
          :label,
          :image,
+          :image_upload_id,
          :description,
          :required,
          :key,
@ -112,6 +114,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
          :property,
          :preview_template,
          :placeholder,
+          :can_create_tag,
          prefill: mapped_params,
          content: mapped_params,
          condition: mapped_params,
@ -161,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
--- a/app/controllers/custom_wizard/realtime_validations.rb
+++ b/app/controllers/custom_wizard/realtime_validations.rb
--- a/app/controllers/custom_wizard/steps.rb
+++ b/app/controllers/custom_wizard/steps.rb
--- a/app/controllers/custom_wizard/wizard.rb
+++ b/app/controllers/custom_wizard/wizard.rb
@ -0,0 +1,53 @@
+# frozen_string_literal: true
+class CustomWizard::WizardController < ::ApplicationController
+  before_action :ensure_plugin_enabled
+  before_action :ensure_logged_in, only: [:skip]
+
+  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
+      builder = CustomWizard::Builder.new(params[:wizard_id].underscore, current_user)
+      return nil unless builder.present?
+      opts = {}
+      opts[:reset] = params[:reset]
+      builder.build(opts, params)
+    end
+  end
+
+  private
+
+  def ensure_plugin_enabled
+    unless SiteSetting.custom_wizard_enabled
+      redirect_to path("/")
+    end
+  end
+end
--- a/app/jobs/regular/refresh_api_access_token.rb
+++ b/app/jobs/regular/refresh_api_access_token.rb
--- a/app/jobs/regular/set_after_time_wizard.rb
+++ b/app/jobs/regular/set_after_time_wizard.rb
--- a/app/serializers/custom_wizard/api/authorization_serializer.rb
+++ b/app/serializers/custom_wizard/api/authorization_serializer.rb
--- a/app/serializers/custom_wizard/api/basic_endpoint_serializer.rb
+++ b/app/serializers/custom_wizard/api/basic_endpoint_serializer.rb
--- a/app/serializers/custom_wizard/api/endpoint_serializer.rb
+++ b/app/serializers/custom_wizard/api/endpoint_serializer.rb
--- a/app/serializers/custom_wizard/api/log_serializer.rb
+++ b/app/serializers/custom_wizard/api/log_serializer.rb
--- a/app/serializers/custom_wizard/api_serializer.rb
+++ b/app/serializers/custom_wizard/api_serializer.rb
--- a/app/serializers/custom_wizard/basic_api_serializer.rb
+++ b/app/serializers/custom_wizard/basic_api_serializer.rb
--- a/app/serializers/custom_wizard/basic_wizard_serializer.rb
+++ b/app/serializers/custom_wizard/basic_wizard_serializer.rb
--- a/app/serializers/custom_wizard/custom_field_serializer.rb
+++ b/app/serializers/custom_wizard/custom_field_serializer.rb
--- a/app/serializers/custom_wizard/log_serializer.rb
+++ b/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
--- a/app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
+++ b/app/serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb
--- a/app/serializers/custom_wizard/submission_serializer.rb
+++ b/app/serializers/custom_wizard/submission_serializer.rb
@ -0,0 +1,32 @@
+# frozen_string_literal: true
+class CustomWizard::SubmissionSerializer < ApplicationSerializer
+  attributes :id,
+             :fields,
+             :submitted_at
+
+  has_one :user, serializer: ::BasicUserSerializer, embed: :objects
+
+  def include_user?
+    object.user.present?
+  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
--- a/app/serializers/custom_wizard/wizard_field_serializer.rb
+++ b/app/serializers/custom_wizard/wizard_field_serializer.rb
@ -17,6 +17,7 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
             :property,
             :content,
             :tag_groups,
+             :can_create_tag,
             :validations,
             :max_length,
             :char_counter,
@ -42,13 +43,8 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
    object.value
  end

-  def i18n_key
-    @i18n_key ||= "wizard.step.#{object.step.id}.fields.#{object.id}".underscore
-  end
-
  def label
-    return object.label if object.label.present?
-    I18n.t("#{object.key || i18n_key}.label", default: '')
+    I18n.t("#{i18n_key}.label", default: object.label, base_url: Discourse.base_url)
  end

  def include_label?
@ -56,14 +52,21 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
  end

  def description
-    return object.description if object.description.present?
-    I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url)
+    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
@ -72,15 +75,6 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
    object.image.present?
  end

-  def placeholder
-    return object.placeholder if object.placeholder.present?
-    I18n.t("#{object.key || i18n_key}.placeholder", default: '')
-  end
-
-  def include_placeholder?
-    placeholder.present?
-  end
-
  def file_types
    object.file_types
  end
@ -105,6 +99,10 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
    object.tag_groups
  end

+  def can_create_tag
+    object.can_create_tag
+  end
+
  def validations
    validations = {}
    object.validations&.each do |type, props|
@ -127,4 +125,14 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
  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
--- a/app/serializers/custom_wizard/wizard_serializer.rb
+++ b/app/serializers/custom_wizard/wizard_serializer.rb
@ -9,13 +9,10 @@ class CustomWizard::WizardSerializer < CustomWizard::BasicWizardSerializer
             :completed,
             :required,
             :permitted,
-             :uncategorized_category_id,
-             :categories,
             :resume_on_revisit

  has_many :steps, serializer: ::CustomWizard::StepSerializer, embed: :objects
  has_one :user, serializer: ::BasicUserSerializer, embed: :objects
-  has_many :groups, serializer: ::BasicGroupSerializer, embed: :objects

  def completed
    object.completed?
@ -46,30 +43,4 @@ class CustomWizard::WizardSerializer < CustomWizard::BasicWizardSerializer
  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
-
-  def categories
-    object.categories.map do |category|
-      if category.respond_to?(:to_h)
-        category.to_h
-      else
-        ::BasicCategorySerializer.new(category).as_json
-      end
-    end
-  end
 end
--- a/app/serializers/custom_wizard/wizard_step_serializer.rb
+++ b/app/serializers/custom_wizard/wizard_step_serializer.rb
@ -39,13 +39,8 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
    object.previous.present?
  end

-  def i18n_key
-    @i18n_key ||= "wizard.step.#{object.id}".underscore
-  end
-
  def title
-    return PrettyText.cook(object.title) if object.title
-    PrettyText.cook(I18n.t("#{object.key || i18n_key}.title", default: ''))
+    I18n.t("#{i18n_key}.title", default: object.title, base_url: Discourse.base_url)
  end

  def include_title?
@ -53,8 +48,7 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
  end

  def description
-    return object.description if object.description
-    PrettyText.cook(I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url))
+    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
  end

  def include_description?
@ -80,4 +74,10 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
  def final
    object.final?
  end
+
+  protected
+
+  def i18n_key
+    @i18n_key ||= "#{object.wizard.id}.#{object.id}".underscore
+  end
 end
--- a/app/views/layouts/qunit.html.erb
+++ b/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>
--- a/assets/javascripts/discourse/components/custom-field-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-field-input.js.es6
@ -3,27 +3,12 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
 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",
  topicSerializers: ["topic_view", "topic_list_item"],
  postSerializers: ["post"],
  groupSerializers: ["basic_group"],
  categorySerializers: ["basic_category"],
-  klassContent: generateContent(
-    ["topic", "post", "group", "category"],
-    "klass"
-  ),
-  typeContent: generateContent(
-    ["string", "boolean", "integer", "json"],
-    "type"
-  ),
  showInputs: or("field.new", "field.edit"),
  classNames: ["custom-field-input"],
  loading: or("saving", "destroying"),
@ -40,9 +25,13 @@ export default Component.extend({
    const serializers = this.get(`${klass}Serializers`);

    if (serializers) {
-      return generateContent(serializers, "serializers");
-    } else {
-      return [];
+      return serializers.reduce((result, key) => {
+        result.push({
+          id: key,
+          name: I18n.t(`admin.wizard.custom_field.serializers.${key}`),
+        });
+        return result;
+      }, []);
    }
  },

--- a/assets/javascripts/discourse/components/custom-user-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-user-selector.js.es6
@ -3,10 +3,11 @@ import {
  observes,
 } from "discourse-common/utils/decorators";
 import { renderAvatar } from "discourse/helpers/user-avatar";
-import userSearch from "../lib/user-search";
-import WizardI18n from "../lib/wizard-i18n";
+import userSearch from "discourse/lib/user-search";
+import I18n from "I18n";
 import Handlebars from "handlebars";
 import { isEmpty } from "@ember/utils";
+import TextField from "@ember/component/text-field";

 const template = function (params) {
  const options = params.options;
@ -31,7 +32,7 @@ const template = function (params) {
  return new Handlebars.SafeString(html).string;
 };

-export default Ember.TextField.extend({
+export default TextField.extend({
  attributeBindings: ["autofocus", "maxLength"],
  autocorrect: false,
  autocapitalize: false,
@ -40,7 +41,7 @@ export default Ember.TextField.extend({

  @computed("placeholderKey")
  placeholder(placeholderKey) {
-    return placeholderKey ? WizardI18n(placeholderKey) : "";
+    return placeholderKey ? I18n.t(placeholderKey) : "";
  },

  @observes("usernames")
@ -55,7 +56,6 @@ export default Ember.TextField.extend({
    let self = this,
      selected = [],
      groups = [],
-      currentUser = this.currentUser,
      includeMentionableGroups =
        this.get("includeMentionableGroups") === "true",
      includeMessageableGroups =
@ -66,13 +66,8 @@ export default Ember.TextField.extend({
    function excludedUsernames() {
      // hack works around some issues with allowAny eventing
      const usernames = self.get("single") ? [] : selected;
-
-      if (currentUser && self.get("excludeCurrentUser")) {
-        return usernames.concat([currentUser.get("username")]);
-      }
      return usernames;
    }
-
    $(this.element)
      .val(this.get("usernames"))
      .autocomplete({
@ -84,7 +79,6 @@ export default Ember.TextField.extend({

        dataSource(term) {
          const termRegex = /[^a-zA-Z0-9_\-\.@\+]/;
-
          let results = userSearch({
            term: term.replace(termRegex, ""),
            topicId: self.get("topicId"),
--- a/assets/javascripts/discourse/components/custom-wizard-category-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-category-selector.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6
@ -1,5 +1,6 @@
 import ComposerEditor from "discourse/components/composer-editor";
 import {
+  bind,
  default as discourseComputed,
  on,
 } from "discourse-common/utils/decorators";
@ -8,10 +9,12 @@ 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 "../models/site";
+import Site from "discourse/models/site";
 import { uploadIcon } from "discourse/lib/uploads";
 import { dasherize } from "@ember/string";

+const IMAGE_MARKDOWN_REGEX = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g;
+
 export default ComposerEditor.extend({
  classNameBindings: ["fieldClass"],
  allowUpload: true,
@ -24,8 +27,8 @@ export default ComposerEditor.extend({
  lastValidatedAt: "lastValidatedAt",
  popupMenuOptions: [],
  draftStatus: "null",
-  replyPlaceholder: alias("field.placeholder"),
-  uploadingFieldId: null,
+  replyPlaceholder: alias("field.translatedPlaceholder"),
+  wizardEventFieldId: null,

  @on("didInsertElement")
  _composerEditorInit() {
@ -34,7 +37,7 @@ export default ComposerEditor.extend({
    if (this.siteSettings.enable_mentions) {
      $input.autocomplete({
        template: findRawTemplate("user-selector-autocomplete"),
-        dataSource: (term) => this.userSearchTerm.call(this, term),
+        dataSource: (term) => this._userSearchTerm.call(this, term),
        key: "@",
        transformComplete: (v) => v.username || v.name,
        afterComplete: (value) => {
@ -76,7 +79,6 @@ export default ComposerEditor.extend({

    const wizardEventNames = ["insert-text", "replace-text"];
    const eventPrefix = this.eventPrefix;
-    const session = this.get("session");
    this.appEvents.reopen({
      trigger(name, ...args) {
        let eventParts = name.split(":");
@ -87,26 +89,8 @@ export default ComposerEditor.extend({
          currentEventPrefix !== "wizard-editor" &&
          wizardEventNames.some((wen) => wen === currentEventName)
        ) {
-          let wizardName = name.replace(eventPrefix, "wizard-editor");
-          if (currentEventName === "insert-text") {
-            args = {
-              text: args[0],
-            };
-          }
-          if (currentEventName === "replace-text") {
-            args = {
-              oldVal: args[0],
-              newVal: args[1],
-            };
-          }
-          let wizardArgs = Object.assign(
-            {},
-            {
-              fieldId: session.get("uploadingFieldId"),
-            },
-            args
-          );
-          return this._super(wizardName, wizardArgs);
+          let wizardEventName = name.replace(eventPrefix, "wizard-editor");
+          return this._super(wizardEventName, ...args);
        } else {
          return this._super(name, ...args);
        }
@ -138,11 +122,34 @@ export default ComposerEditor.extend({
    }
  },

+  @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 && !this.site.mobileView) {
+      if (this.allowUpload && this.uploadIcon) {
        toolbar.addButton({
          id: "upload",
          group: "insertions",
@ -187,14 +194,14 @@ export default ComposerEditor.extend({
      }
    },

-    previewUpdated($preview) {
-      highlightSyntax($preview[0], this.siteSettings, this.session);
+    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);
+        linkSeenMentionableItems(preview, this.siteSettings);
      }
      this._super(...arguments);
    },
@ -213,7 +220,7 @@ export default ComposerEditor.extend({
    },

    showUploadModal() {
-      this.session.set("uploadingFieldId", this.field.id);
+      this.session.set("wizardEventFieldId", this.field.id);
      document.getElementById(this.fileUploadElementId).click();
    },
  },
--- a/assets/javascripts/discourse/components/custom-wizard-composer-hyperlink.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-composer-hyperlink.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-date-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-date-input.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-date-time-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-date-time-input.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-field-category.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-category.js.es6
@ -1,7 +1,8 @@
 import { observes } from "discourse-common/utils/decorators";
 import Category from "discourse/models/category";
+import Component from "@ember/component";

-export default Ember.Component.extend({
+export default Component.extend({
  didInsertElement() {
    const property = this.field.property || "id";
    const value = this.field.value;
--- a/assets/javascripts/discourse/components/custom-wizard-field-checkbox.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-checkbox.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-composer-preview.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6
@ -3,8 +3,9 @@ import {
  observes,
 } from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
+import Component from "@ember/component";

-export default Ember.Component.extend({
+export default Component.extend({
  showPreview: false,
  classNameBindings: [
    ":wizard-field-composer",
--- a/assets/javascripts/discourse/components/custom-wizard-field-date-time.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-date-time.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-field-date.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-date.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-field-dropdown.js.es6
+++ b/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);
+    },
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-field-group.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-group.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field-number.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-number.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field-tag.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-tag.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field-text.js.es6
+++ b/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();
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-field-textarea.js.es6
+++ b/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();
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-field-time.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-time.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-field-upload.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-upload.js.es6
@ -9,6 +9,9 @@ export default Component.extend(UppyUploadMixin, {
  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 &&
--- a/assets/javascripts/discourse/components/custom-wizard-field-url.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-url.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field-user-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-field-user-selector.js.es6
@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});
--- a/assets/javascripts/discourse/components/custom-wizard-field.js.es6
+++ b/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);
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6
+++ b/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("/");
+      }
+    },
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-similar-topics.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-similar-topics.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-step-form.js.es6
+++ b/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}`,
+});
--- a/assets/javascripts/discourse/components/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-step.js.es6
@ -0,0 +1,233 @@
+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";
+
+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() {
+    schedule("afterRender", () => {
+      const $invalid = $(
+        ".wizard-field.invalid:nth-of-type(1) .wizard-focusable"
+      );
+
+      if ($invalid.length) {
+        return $invalid.focus();
+      }
+
+      $(".wizard-focusable:first").focus();
+    });
+  },
+
+  animateInvalidFields() {
+    schedule("afterRender", () => {
+      let $element = $(
+        ".invalid input[type=text],.invalid textarea,.invalid input[type=checkbox],.invalid .select-kit"
+      );
+
+      if ($element.length) {
+        $([document.documentElement, document.body]).animate(
+          {
+            scrollTop: $element.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();
+      }
+    },
+  },
+});
--- a/assets/javascripts/discourse/components/custom-wizard-tag-chooser.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-tag-chooser.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-tag-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-tag-selector.js.es6
--- a/assets/javascripts/discourse/components/custom-wizard-text-field.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-text-field.js.es6
@ -1,10 +1,9 @@
-/* eslint no-undef: 0*/
-
 import computed from "discourse-common/utils/decorators";
 import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
-import WizardI18n from "../lib/wizard-i18n";
+import I18n from "I18n";
+import TextField from "@ember/component/text-field";

-export default Ember.TextField.extend({
+export default TextField.extend({
  attributeBindings: [
    "autocorrect",
    "autocapitalize",
@ -15,7 +14,7 @@ export default Ember.TextField.extend({

  @computed
  dir() {
-    if (Wizard.SiteSettings.support_mixed_text_direction) {
+    if (this.siteSettings.support_mixed_text_direction) {
      let val = this.value;
      if (val) {
        return isRTL(val) ? "rtl" : "ltr";
@ -26,7 +25,7 @@ export default Ember.TextField.extend({
  },

  keyUp() {
-    if (Wizard.SiteSettings.support_mixed_text_direction) {
+    if (this.siteSettings.support_mixed_text_direction) {
      let val = this.value;
      if (isRTL(val)) {
        this.set("dir", "rtl");
@ -40,6 +39,6 @@ export default Ember.TextField.extend({

  @computed("placeholderKey")
  placeholder(placeholderKey) {
-    return placeholderKey ? WizardI18n(placeholderKey) : "";
+    return placeholderKey ? I18n.t(placeholderKey) : "";
  },
 });
--- a/assets/javascripts/discourse/components/custom-wizard-time-input.js.es6
+++ b/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({});
--- a/assets/javascripts/discourse/components/field-validators.js.es6
+++ b/assets/javascripts/discourse/components/field-validators.js.es6
@ -1,4 +1,5 @@
 import Component from "@ember/component";
+
 export default Component.extend({
  actions: {
    perform() {
--- a/assets/javascripts/discourse/components/similar-topics-validator.js.es6
+++ b/assets/javascripts/discourse/components/similar-topics-validator.js.es6
@ -1,4 +1,4 @@
-import WizardFieldValidator from "../../wizard/components/validator";
+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";
--- a/assets/javascripts/discourse/components/validator.js.es6
+++ b/assets/javascripts/discourse/components/validator.js.es6
@ -1,7 +1,6 @@
 import Component from "@ember/component";
 import { equal } from "@ember/object/computed";
-import { ajax } from "discourse/lib/ajax";
-import { getToken } from "wizard/lib/ajax";
+import { ajax, getToken } from "discourse/lib/ajax";

 export default Component.extend({
  classNames: ["validator"],
@ -10,7 +9,6 @@ export default Component.extend({
  invalidMessageKey: null,
  isValid: null,
  isInvalid: equal("isValid", false),
-  layoutName: "components/validator", // useful for sharing the template with extending components

  init() {
    this._super(...arguments);
--- a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
+++ b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
@ -1,21 +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");
-    },
-  },
-});
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@ -1,8 +1,7 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { and, empty, equal, or } from "@ember/object/computed";
+import { empty, equal, or } from "@ember/object/computed";
 import { notificationLevels, selectKitContent } from "../lib/wizard";
 import { computed } from "@ember/object";
-import wizardSchema from "../lib/wizard-schema";
 import UndoChanges from "../mixins/undo-changes";
 import Component from "@ember/component";
 import I18n from "I18n";
@ -16,6 +15,7 @@ export default Component.extend(UndoChanges, {
  createTopic: equal("action.type", "create_topic"),
  updateProfile: equal("action.type", "update_profile"),
  watchCategories: equal("action.type", "watch_categories"),
+  watchTags: equal("action.type", "watch_tags"),
  sendMessage: equal("action.type", "send_message"),
  openComposer: equal("action.type", "open_composer"),
  sendToApi: equal("action.type", "send_to_api"),
@ -25,8 +25,6 @@ export default Component.extend(UndoChanges, {
  createGroup: equal("action.type", "create_group"),
  apiEmpty: empty("action.api"),
  groupPropertyTypes: selectKitContent(["id", "name"]),
-  hasAdvanced: or("hasCustomFields", "routeTo"),
-  showAdvanced: and("hasAdvanced", "action.type"),
  hasCustomFields: or(
    "basicTopicFields",
    "updateProfile",
@ -36,22 +34,14 @@ export default Component.extend(UndoChanges, {
  basicTopicFields: or("createTopic", "sendMessage", "openComposer"),
  publicTopicFields: or("createTopic", "openComposer"),
  showPostAdvanced: or("createTopic", "sendMessage"),
-  actionTypes: Object.keys(wizardSchema.action.types).map((type) => {
-    return {
-      id: type,
-      name: I18n.t(`admin.wizard.action.${type}.label`),
-    };
-  }),
  availableNotificationLevels: notificationLevels.map((type) => {
    return {
      id: type,
-      name: I18n.t(
-        `admin.wizard.action.watch_categories.notification_level.${type}`
-      ),
+      name: I18n.t(`admin.wizard.action.watch_x.notification_level.${type}`),
    };
  }),

-  messageUrl: "https://thepavilion.io/t/2810",
+  messageUrl: "https://discourse.pluginmanager.org/t/action-settings",

  @discourseComputed("action.type")
  messageKey(type) {
@ -101,4 +91,14 @@ export default Component.extend(UndoChanges, {
    }
    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");
+  },
 });
--- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
@ -1,5 +1,5 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { alias, equal, or } from "@ember/object/computed";
+import { equal, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { selectKitContent } from "../lib/wizard";
 import UndoChanges from "../mixins/undo-changes";
@ -27,8 +27,7 @@ export default Component.extend(UndoChanges, {
  isTextType: or("isText", "isTextarea", "isComposer"),
  isComposerPreview: equal("field.type", "composer_preview"),
  categoryPropertyTypes: selectKitContent(["id", "slug"]),
-  showAdvanced: alias("field.type"),
-  messageUrl: "https://thepavilion.io/t/2809",
+  messageUrl: "https://discourse.pluginmanager.org/t/field-settings",

  @discourseComputed("field.type")
  validations(type) {
@ -144,11 +143,17 @@ export default Component.extend(UndoChanges, {

  actions: {
    imageUploadDone(upload) {
-      this.set("field.image", upload.url);
+      this.setProperties({
+        "field.image": upload.url,
+        "field.image_upload_id": upload.id,
+      });
    },

    imageUploadDeleted() {
-      this.set("field.image", null);
+      this.setProperties({
+        "field.image": null,
+        "field.image_upload_id": null,
+      });
    },
  },
 });
--- a/assets/javascripts/discourse/components/wizard-custom-step.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-step.js.es6
@ -24,11 +24,17 @@ export default Component.extend({

  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,
+      });
    },
  },
 });
--- a/assets/javascripts/discourse/components/wizard-links.js.es6
+++ b/assets/javascripts/discourse/components/wizard-links.js.es6
@ -71,6 +71,17 @@ export default Component.extend({
    });
  },

+  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");
@ -78,16 +89,9 @@ export default Component.extend({
      let params = setWizardDefaults({}, itemType);

      params.isNew = true;
+      params.index = this.getNextIndex();

-      let index = 0;
-      if (items.length) {
-        let last_item = items[items.length - 1];
-        index = Number(last_item.id.split("_").pop());
-      }
-
-      params.index = index;
-
-      let id = `${itemType}_${index + 1}`;
+      let id = `${itemType}_${params.index + 1}`;
      if (itemType === "field") {
        id = `${this.parentId}_${id}`;
      }
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@ -377,7 +377,7 @@ export default Component.extend({
      this.changeValue(event.target.value);
    },

-    changeUserValue(previousValue, value) {
+    changeUserValue(value) {
      this.changeValue(value);
    },
  },
--- a/assets/javascripts/discourse/components/wizard-message.js.es6
+++ b/assets/javascripts/discourse/components/wizard-message.js.es6
@ -6,6 +6,7 @@ import I18n from "I18n";
 const icons = {
  error: "times-circle",
  success: "check-circle",
+  warn: "exclamation-circle",
  info: "info-circle",
 };

--- a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
+++ b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
@ -6,7 +6,8 @@ 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 ["days", "weeks", "months", "years"].map((unit) => {
--- a/assets/javascripts/discourse/components/wizard-subscription-badge.js.es6
+++ b/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);
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-subscription-container.js.es6
+++ b/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" : "dash";
+  },
+
+  @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`;
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-subscription-cta.js.es6
+++ b/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();
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-subscription-selector.js.es6
+++ b/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 wizardSchema 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")
+  content(feature, attribute) {
+    return wizardSchema[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";
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-header.js.es6
+++ b/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;
+    }
+  ),
+});
--- a/assets/javascripts/discourse/components/wizard-subscription-selector/wizard-subscription-selector-row.js.es6
+++ b/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;
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-table-field.js.es6
+++ b/assets/javascripts/discourse/components/wizard-table-field.js.es6
@ -0,0 +1,139 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { equal, notEmpty } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
+import I18n from "I18n";
+
+export default Component.extend({
+  classNameBindings: ["value.type"],
+  isText: equal("value.type", "text"),
+  isComposer: equal("value.type", "composer"),
+  isDate: equal("value.type", "date"),
+  isTime: equal("value.type", "time"),
+  isDateTime: equal("value.type", "date_time"),
+  isNumber: equal("value.type", "number"),
+  isCheckbox: equal("value.type", "checkbox"),
+  isUrl: equal("value.type", "url"),
+  isUpload: equal("value.type", "upload"),
+  isDropdown: equal("value.type", "dropdown"),
+  isTag: equal("value.type", "tag"),
+  isCategory: equal("value.type", "category"),
+  isGroup: equal("value.type", "group"),
+  isUserSelector: equal("value.type", "user_selector"),
+  isSubmittedAt: equal("field", "submitted_at"),
+  isComposerPreview: equal("value.type", "composer_preview"),
+  textState: "text-collapsed",
+  toggleText: I18n.t("admin.wizard.expand_text"),
+
+  @discourseComputed("value", "isUser", "isSubmittedAt")
+  hasValue(value, isUser, isSubmittedAt) {
+    if (isUser || isSubmittedAt) {
+      return value;
+    }
+    return value && value.value;
+  },
+
+  @discourseComputed("field", "value.type")
+  isUser(field, type) {
+    return field === "username" || field === "user" || type === "user";
+  },
+
+  @discourseComputed("value.type")
+  isLongtext(type) {
+    return type === "textarea" || type === "long_text";
+  },
+
+  @discourseComputed("value")
+  checkboxValue(value) {
+    const isCheckbox = this.get("isCheckbox");
+    if (isCheckbox) {
+      if (value.value.includes("true")) {
+        return true;
+      } else if (value.value.includes("false")) {
+        return false;
+      }
+    }
+  },
+
+  @action
+  expandText() {
+    const state = this.get("textState");
+
+    if (state === "text-collapsed") {
+      this.set("textState", "text-expanded");
+      this.set("toggleText", I18n.t("admin.wizard.collapse_text"));
+    } else if (state === "text-expanded") {
+      this.set("textState", "text-collapsed");
+      this.set("toggleText", I18n.t("admin.wizard.expand_text"));
+    }
+  },
+
+  @discourseComputed("value")
+  file(value) {
+    const isUpload = this.get("isUpload");
+    if (isUpload) {
+      return value.value;
+    }
+  },
+
+  @discourseComputed("value")
+  submittedUsers(value) {
+    const isUserSelector = this.get("isUserSelector");
+    const users = [];
+
+    if (isUserSelector) {
+      const userData = value.value;
+      const usernames = [];
+
+      if (userData.indexOf(",")) {
+        usernames.push(...userData.split(","));
+
+        usernames.forEach((u) => {
+          const user = {
+            username: u,
+            url: `/u/${u}`,
+          };
+          users.push(user);
+        });
+      }
+    }
+    return users;
+  },
+
+  @discourseComputed("isUser", "field", "value")
+  username(isUser, field, value) {
+    if (isUser) {
+      return value.username;
+    }
+    if (field === "username") {
+      return value.value;
+    }
+    return null;
+  },
+
+  showUsername: notEmpty("username"),
+
+  @discourseComputed("username")
+  userProfileUrl(username) {
+    if (username) {
+      return `/u/${username}`;
+    }
+    return "/";
+  },
+
+  @discourseComputed("value")
+  categoryUrl(value) {
+    const isCategory = this.get("isCategory");
+    if (isCategory) {
+      return `/c/${value.value}`;
+    }
+  },
+
+  @discourseComputed("value")
+  groupUrl(value) {
+    const isGroup = this.get("isGroup");
+    if (isGroup) {
+      return `/g/${value.value}`;
+    }
+  },
+});
--- a/assets/javascripts/discourse/components/wizard-text-editor.js.es6
+++ b/assets/javascripts/discourse/components/wizard-text-editor.js.es6
@ -5,11 +5,7 @@ import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import I18n from "I18n";

-const excludedUserProperties = [
-  "avatar",
-  "profile_background",
-  "card_background",
-];
+const excludedUserProperties = ["profile_background", "card_background"];

 export default Component.extend({
  classNames: "wizard-text-editor",
@ -52,12 +48,12 @@ export default Component.extend({

  @discourseComputed("wizardFields")
  wizardFieldList(wizardFields) {
-    return wizardFields.map((f) => ` w{${f.id}}`);
+    return (wizardFields || []).map((f) => ` w{${f.id}}`);
  },

  @discourseComputed("wizardActions")
  wizardActionList(wizardActions) {
-    return wizardActions.map((a) => ` w{${a.id}}`);
+    return (wizardActions || []).map((a) => ` w{${a.id}}`);
  },

  actions: {
--- a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
+++ b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
@ -1,3 +1,7 @@
 {{#if currentUser.admin}}
  {{nav-item route="adminWizards" label="admin.wizard.nav_label"}}
+
+  {{#if wizardErrorNotice}}
+    {{d-icon "exclaimation-circle"}}
+  {{/if}}
 {{/if}}
--- a/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.hbs
@ -6,11 +6,11 @@
  </label>
  <div class="controls">
    {{combo-box
-    value=wizardListVal
-    content=wizardList
-    onChange=(action "changeWizard")
-    options=(hash
-      none="admin.wizard.select"
-    )}}
+      value=wizardListVal
+      content=wizardList
+      onChange=(action "changeWizard")
+      options=(hash
+        none="admin.wizard.select"
+      )}}
  </div>
 </section>
--- a/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js.es6
+++ b/assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js.es6
@ -1,9 +1,9 @@
-import CustomWizard from "../../models/custom-wizard";
+import CustomWizardAdmin from "../../models/custom-wizard-admin";
 import { popupAjaxError } from "discourse/lib/ajax-error";

 export default {
  setupComponent(attrs, component) {
-    CustomWizard.all()
+    CustomWizardAdmin.all()
      .then((result) => {
        component.set("wizardList", result);
      })
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@ -11,7 +11,7 @@ export default Controller.extend({
  queryParams: ["refresh_list"],
  loadingSubscriptions: false,
  notAuthorized: not("api.authorized"),
-  endpointMethods: selectKitContent(["GET", "PUT", "POST", "PATCH", "DELETE"]),
+  endpointMethods: selectKitContent(["PUT", "POST", "PATCH", "DELETE"]),
  showRemove: not("isNew"),
  showRedirectUri: and("threeLeggedOauth", "api.name"),
  responseIcon: null,
@ -88,6 +88,11 @@ export default Controller.extend({
  twoLeggedOauth: equal("api.authType", "oauth_2"),
  threeLeggedOauth: equal("api.authType", "oauth_3"),

+  @discourseComputed("api.isNew")
+  nameClass(isNew) {
+    return isNew ? "new" : "saved";
+  },
+
  actions: {
    addParam() {
      this.get("api.authParams").pushObject({});
@ -149,7 +154,6 @@ export default Controller.extend({
      const api = this.get("api");
      const name = api.name;
      const authType = api.authType;
-      let refreshList = false; // eslint-disable-line
      let error;

      if (!name || !authType) {
@ -164,11 +168,6 @@ export default Controller.extend({
        data["title"] = api.title;
      }

-      const originalTitle = this.get("api.originalTitle");
-      if (api.get("isNew") || (originalTitle && api.title !== originalTitle)) {
-        refreshList = true;
-      }
-
      if (api.get("isNew")) {
        data["new"] = true;
      }
--- a/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
@ -0,0 +1,14 @@
+import Controller from "@ember/controller";
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+
+export default Controller.extend(ModalFunctionality, {
+  actions: {
+    save() {
+      this.send("closeModal");
+    },
+
+    resetToDefault() {
+      this.get("model.reset")();
+    },
+  },
+});
--- a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
@ -4,7 +4,7 @@ import CustomWizardCustomField from "../models/custom-wizard-custom-field";
 export default Controller.extend({
  messageKey: "create",
  fieldKeys: ["klass", "type", "name", "serializers"],
-  documentationUrl: "https://thepavilion.io/t/3572",
+  documentationUrl: "https://discourse.pluginmanager.org/t/custom-fields",

  actions: {
    addField() {
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs-show.js.es6
@ -0,0 +1,52 @@
+import discourseComputed from "discourse-common/utils/decorators";
+import { notEmpty } from "@ember/object/computed";
+import CustomWizardLogs from "../models/custom-wizard-logs";
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  refreshing: false,
+  hasLogs: notEmpty("logs"),
+  page: 0,
+  canLoadMore: true,
+  logs: [],
+  messageKey: "viewing",
+
+  loadLogs() {
+    if (!this.canLoadMore) {
+      return;
+    }
+    const page = this.get("page");
+    const wizardId = this.get("wizard.id");
+
+    this.set("refreshing", true);
+
+    CustomWizardLogs.list(wizardId, page)
+      .then((result) => {
+        this.set("logs", this.logs.concat(result.logs));
+      })
+      .finally(() => this.set("refreshing", false));
+  },
+
+  @discourseComputed("hasLogs", "refreshing")
+  noResults(hasLogs, refreshing) {
+    return !hasLogs && !refreshing;
+  },
+
+  actions: {
+    loadMore() {
+      if (!this.loadingMore && this.logs.length < this.total) {
+        this.set("page", (this.page += 1));
+        this.loadLogs();
+      }
+    },
+
+    refresh() {
+      this.setProperties({
+        canLoadMore: true,
+        page: 0,
+        logs: [],
+      });
+      this.loadLogs();
+    },
+  },
+});
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
@ -1,50 +1,34 @@
-import discourseComputed from "discourse-common/utils/decorators";
-import { notEmpty } from "@ember/object/computed";
-import CustomWizardLogs from "../models/custom-wizard-logs";
 import Controller from "@ember/controller";
+import { default as discourseComputed } from "discourse-common/utils/decorators";

 export default Controller.extend({
-  refreshing: false,
-  hasLogs: notEmpty("logs"),
-  page: 0,
-  canLoadMore: true,
-  logs: [],
+  documentationUrl: "https://thepavilion.io/t/2818",

-  loadLogs() {
-    if (!this.canLoadMore) {
-      return;
+  @discourseComputed("wizardId")
+  wizardName(wizardId) {
+    let currentWizard = this.wizardList.find(
+      (wizard) => wizard.id === wizardId
+    );
+    if (currentWizard) {
+      return currentWizard.name;
+    }
+  },
+
+  @discourseComputed("wizardName")
+  messageOpts(wizardName) {
+    return {
+      wizardName,
+    };
+  },
+
+  @discourseComputed("wizardId")
+  messageKey(wizardId) {
+    let key = "select";
+
+    if (wizardId) {
+      key = "viewing";
    }

-    this.set("refreshing", true);
-
-    CustomWizardLogs.list()
-      .then((result) => {
-        if (!result || result.length === 0) {
-          this.set("canLoadMore", false);
-        }
-        this.set("logs", this.logs.concat(result));
-      })
-      .finally(() => this.set("refreshing", false));
-  },
-
-  @discourseComputed("hasLogs", "refreshing")
-  noResults(hasLogs, refreshing) {
-    return !hasLogs && !refreshing;
-  },
-
-  actions: {
-    loadMore() {
-      this.set("page", (this.page += 1));
-      this.loadLogs();
-    },
-
-    refresh() {
-      this.setProperties({
-        canLoadMore: true,
-        page: 0,
-        logs: [],
-      });
-      this.loadLogs();
-    },
+    return key;
  },
 });
--- a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
@ -7,7 +7,7 @@ import I18n from "I18n";
 import { underscore } from "@ember/string";

 export default Controller.extend({
-  messageUrl: "https://thepavilion.io/t/3652",
+  messageUrl: "https://discourse.pluginmanager.org/t/wizard-manager",
  messageKey: "info",
  messageIcon: "info-circle",
  messageClass: "info",
@ -68,7 +68,7 @@ export default Controller.extend({
      file: null,
      filename: null,
    });
-    $("#file-upload").val("");
+    document.getElementById("custom-wizard-file-upload").value = "";
  },

  @observes("importing", "destroying")
@ -83,7 +83,7 @@ export default Controller.extend({

  actions: {
    upload() {
-      $("#file-upload").click();
+      document.getElementById("custom-wizard-file-upload").click();
    },

    clearFile() {
@ -102,7 +102,7 @@ export default Controller.extend({
      if (maxFileSize < file.size) {
        this.setMessage("error", "file_size_error");
        this.set("file", null);
-        $("#file-upload").val("");
+        document.getElementById("custom-wizard-file-upload").value = "";
      } else {
        this.setProperties({
          file,
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
@ -1,6 +1,72 @@
 import Controller from "@ember/controller";
+import { empty } from "@ember/object/computed";
+import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
+import showModal from "discourse/lib/show-modal";
+import CustomWizardAdmin from "../models/custom-wizard-admin";
+import { formatModel } from "../lib/wizard-submission";

 export default Controller.extend({
  downloadUrl: fmt("wizard.id", "/admin/wizards/submissions/%@/download"),
+  noResults: empty("submissions"),
+  page: 0,
+  total: 0,
+
+  loadMoreSubmissions() {
+    const page = this.get("page");
+    const wizardId = this.get("wizard.id");
+
+    this.set("loadingMore", true);
+    CustomWizardAdmin.submissions(wizardId, page)
+      .then((result) => {
+        if (result.submissions) {
+          const { submissions } = formatModel(result);
+
+          this.get("submissions").pushObjects(submissions);
+        }
+      })
+      .finally(() => {
+        this.set("loadingMore", false);
+      });
+  },
+
+  @discourseComputed("submissions.[]", "fields.@each.enabled")
+  displaySubmissions(submissions, fields) {
+    let result = [];
+
+    submissions.forEach((submission) => {
+      let sub = {};
+
+      Object.keys(submission).forEach((fieldId) => {
+        if (fields.some((f) => f.id === fieldId && f.enabled)) {
+          sub[fieldId] = submission[fieldId];
+        }
+      });
+      result.push(sub);
+    });
+
+    return result;
+  },
+
+  actions: {
+    loadMore() {
+      if (!this.loadingMore && this.submissions.length < this.total) {
+        this.set("page", this.get("page") + 1);
+        this.loadMoreSubmissions();
+      }
+    },
+
+    showEditColumnsModal() {
+      return showModal("admin-wizards-columns", {
+        model: {
+          columns: this.get("fields"),
+          reset: () => {
+            this.get("fields").forEach((field) => {
+              field.set("enabled", true);
+            });
+          },
+        },
+      });
+    },
+  },
 });
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions.js.es6
@ -0,0 +1,34 @@
+import Controller from "@ember/controller";
+import { default as discourseComputed } from "discourse-common/utils/decorators";
+
+export default Controller.extend({
+  documentationUrl: "https://thepavilion.io/t/2818",
+
+  @discourseComputed("wizardId")
+  wizardName(wizardId) {
+    let currentWizard = this.wizardList.find(
+      (wizard) => wizard.id === wizardId
+    );
+    if (currentWizard) {
+      return currentWizard.name;
+    }
+  },
+
+  @discourseComputed("wizardName")
+  messageOpts(wizardName) {
+    return {
+      wizardName,
+    };
+  },
+
+  @discourseComputed("wizardId")
+  messageKey(wizardId) {
+    let key = "select";
+
+    if (wizardId) {
+      key = "viewing";
+    }
+
+    return key;
+  },
+});
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@ -36,7 +36,8 @@ export default Controller.extend({

  @discourseComputed("wizard.id")
  wizardUrl(wizardId) {
-    return window.location.origin + "/w/" + dasherize(wizardId);
+    let baseUrl = window.location.href.split("/admin");
+    return baseUrl[0] + "/w/" + dasherize(wizardId);
  },

  @discourseComputed("wizard.after_time_scheduled")
@ -92,7 +93,11 @@ export default Controller.extend({
      wizard
        .save(opts)
        .then((result) => {
-          this.send("afterSave", result.wizard_id);
+          if (result.wizard_id) {
+            this.send("afterSave", result.wizard_id);
+          } else if (result.errors) {
+            this.set("error", result.errors.join(", "));
+          }
        })
        .catch((result) => {
          this.set("error", this.getErrorMessage(result));
@ -118,10 +123,6 @@ export default Controller.extend({
      controller.setup();
    },

-    toggleAdvanced() {
-      this.toggleProperty("wizard.showAdvanced");
-    },
-
    copyUrl() {
      const $copyRange = $('<p id="copy-range"></p>');
      $copyRange.html(this.wizardUrl);
--- a/Mehr anzeigen
+++ b/Mehr anzeigen