.discourse-compatibility

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

.github/workflows/discourse-plugin.yml

@@ -1,13 +0,0 @@
-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-linting.yml

@@ -0,0 +1,53 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - master
+      - main
+      - stable
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+
+      - 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
+
+      - name: ESLint
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,assets}/javascripts/{discourse,wizard}
+
+      - name: Prettier
+        run: |
+          yarn prettier -v
+          if [ -d "assets" ]; then \
+            yarn prettier --list-different "assets/javascripts/{discourse,wizard}/**/*.{scss,js,es6}" ; \
+          fi
+
+      - name: Ember template lint
+        run: yarn ember-template-lint assets/javascripts
+
+      - name: Rubocop
+        run: bundle exec rubocop .

.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.");
+              }

.github/workflows/plugin-tests.yml

@@ -0,0 +1,134 @@
+name: Plugin Tests
+
+on:
+  push:
+    branches:
+      - stable
+      - master
+      - main
+  pull_request:
+  schedule:
+    - cron: '0 */12 * * *'
+
+jobs:
+  build:
+    name: ${{ matrix.build_type }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    env:
+      DISCOURSE_HOSTNAME: www.example.com
+      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
+      RAILS_ENV: test
+      PGHOST: localhost
+      PGUSER: discourse
+      PGPASSWORD: discourse
+
+    strategy:
+      fail-fast: false
+
+      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@v3
+        with:
+          repository: discourse/discourse
+          ref: ${{ steps.discourse_branch.outputs.value }}
+          fetch-depth: 1
+
+      - name: Install plugin
+        uses: actions/checkout@v2
+        with:
+          path: plugins/${{ github.event.repository.name }}
+          ref: "${{ github.head_ref }}"
+          fetch-depth: 1
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "ci@ci.invalid"
+          git config --global user.name "Discourse CI"
+
+      - name: Setup packages
+        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
+
+      - name: Update imagemagick
+        if: matrix.build_type == 'backend'
+        run: |
+          wget https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-imagemagick
+          chmod +x install-imagemagick
+          sudo ./install-imagemagick
+
+      - name: Setup redis
+        uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: ${{ matrix.redis }}
+
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - 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"
+
+      - 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
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.os }}-yarn-
+
+      - name: Yarn install
+        run: yarn install --dev
+
+      - name: Migrate database
+        run: |
+          bin/rake db:create
+          bin/rake db:migrate
+
+      - name: Plugin RSpec with Coverage
+        if: matrix.build_type == 'backend'
+        run: |
+          if [ -e plugins/${{ steps.repo-name.outputs.value }}/.simplecov ]
+          then
+            cp plugins/${{ steps.repo-name.outputs.value }}/.simplecov .simplecov
+            export COVERAGE=1
+          fi
+          bin/rake plugin:spec[${{ steps.repo-name.outputs.value }}]

.gitignore

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

.rubocop.yml

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

COPYRIGHT.txt

@@ -1,4 +1,4 @@
-All code in this repository is Copyright 2023 by Angus McLeod.
+All code in this repository is Copyright 2018 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.lock

@@ -2,32 +2,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.6.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.20.1)
+    parser (3.0.1.0)
       ast (~> 2.4.1)
-    rainbow (3.1.1)
-    regexp_parser (2.6.0)
+    rainbow (3.0.0)
+    regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.36.0)
-      json (~> 2.3)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.0.0.0)
       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)
+      rexml
+      rubocop-ast (>= 1.2.0, < 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-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-discourse (2.4.1)
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.13.2)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby

README.md

@@ -1,27 +1,3 @@
-# Discourse Custom Wizard Plugin
+# discourse-custom-wizard
 
-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)
+See further: https://thepavilion.io/c/knowledge/discourse/custom-wizard/118

SECURITY.md

@@ -1,7 +0,0 @@
-# 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,13 +3,6 @@ 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

app/controllers/custom_wizard/admin/api.rb

@@ -20,10 +20,6 @@ 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])
 
@@ -134,8 +130,4 @@ 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,9 +1,7 @@
 # frozen_string_literal: true
 class CustomWizard::AdminCustomFieldsController < CustomWizard::AdminController
   def index
-    render_json_dump(
-      custom_fields: custom_field_list
-    )
+    render_json_dump(custom_field_list)
   end
 
   def update

app/controllers/custom_wizard/admin/logs.rb

@@ -1,44 +1,9 @@
 # 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
+    render_serialized(
+      CustomWizard::Log.list(params[:page].to_i, params[:limit].to_i),
+      CustomWizard::LogSerializer
     )
   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/submissions.rb

@@ -13,21 +13,12 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
   def show
     render_json_dump(
       wizard: CustomWizard::BasicWizardSerializer.new(@wizard, root: false),
-      submissions: ActiveModel::ArraySerializer.new(
-        submission_list.submissions,
-        each_serializer: CustomWizard::SubmissionSerializer
-      ),
-      total: submission_list.total
+      submissions: ActiveModel::ArraySerializer.new(ordered_submissions, each_serializer: CustomWizard::SubmissionSerializer)
     )
   end
 
   def download
-    content = ActiveModel::ArraySerializer.new(
-      CustomWizard::Submission.list(@wizard).submissions,
-      each_serializer: CustomWizard::SubmissionSerializer
-    )
-
-    send_data content.to_json,
+    send_data ordered_submissions.to_json,
       filename: "#{Discourse.current_hostname}-wizard-submissions-#{@wizard.name}.json",
       content_type: "application/json",
       disposition: "attachment"
@@ -35,7 +26,7 @@ class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
 
   protected
 
-  def submission_list
-    CustomWizard::Submission.list(@wizard, page: params[:page].to_i)
+  def ordered_submissions
+    CustomWizard::Submission.list(@wizard, order_by: 'id')
   end
 end

app/controllers/custom_wizard/admin/wizard.rb

@@ -88,7 +88,6 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
         :title,
         :key,
         :banner,
-        :banner_upload_id,
         :raw_description,
         :required_data_message,
         :force_final,
@@ -100,7 +99,6 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
           :index,
           :label,
           :image,
-          :image_upload_id,
           :description,
           :required,
           :key,
@@ -114,7 +112,6 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
           :property,
           :preview_template,
           :placeholder,
-          :can_create_tag,
           prefill: mapped_params,
           content: mapped_params,
           condition: mapped_params,
@@ -164,9 +161,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
         mentionable_level: mapped_params,
         messageable_level: mapped_params,
         visibility_level: mapped_params,
-        members_visibility_level: mapped_params,
-        add_event: mapped_params,
-        add_location: mapped_params
+        members_visibility_level: mapped_params
       ]
     )
   end

app/controllers/custom_wizard/steps.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-class CustomWizard::StepsController < ::CustomWizard::WizardClientController
+class CustomWizard::StepsController < ::ApplicationController
+  before_action :ensure_logged_in
   before_action :ensure_can_update
 
   def update
@@ -21,7 +22,7 @@ class CustomWizard::StepsController < ::CustomWizard::WizardClientController
 
     if updater.success?
       wizard_id = update_params[:wizard_id]
-      builder = CustomWizard::Builder.new(wizard_id, current_user, guest_id)
+      builder = CustomWizard::Builder.new(wizard_id, current_user)
       @wizard = builder.build(force: true)
 
       current_step = @wizard.find_step(update[:step_id])
@@ -84,6 +85,7 @@ class CustomWizard::StepsController < ::CustomWizard::WizardClientController
   private
 
   def ensure_can_update
+    @builder = CustomWizard::Builder.new(update_params[:wizard_id], current_user)
     raise Discourse::InvalidParameters.new(:wizard_id) if @builder.template.nil?
     raise Discourse::InvalidAccess.new if !@builder.wizard || !@builder.wizard.can_access?
 

app/controllers/custom_wizard/wizard.rb

@@ -1,10 +1,40 @@
 # 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') }
+class CustomWizard::WizardController < ::ActionController::Base
+  helper ApplicationHelper
+
+  include CurrentUser
+  include CanonicalURL::ControllerExtensions
+  include GlobalPath
+
+  prepend_view_path(Rails.root.join('plugins', 'discourse-custom-wizard', 'app', 'views'))
+  layout :set_wizard_layout
+
+  before_action :preload_wizard_json
+  before_action :ensure_plugin_enabled
+  before_action :ensure_logged_in, only: [:skip]
+  around_action :with_resolved_locale
+
+  helper_method :wizard_page_title
+  helper_method :wizard_theme_id
+  helper_method :wizard_theme_lookup
+  helper_method :wizard_theme_translations_lookup
+
+  def set_wizard_layout
+    action_name === 'qunit' ? 'qunit' : 'wizard'
+  end
+
+  def index
+    respond_to do |format|
+      format.json do
+        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
+      format.html do
+        render "default/empty"
+      end
     end
   end
 
@@ -28,12 +58,76 @@ class CustomWizard::WizardController < ::CustomWizard::WizardClientController
     render json: result
   end
 
+  def qunit
+    raise Discourse::InvalidAccess.new if Rails.env.production?
+
+    respond_to do |format|
+      format.html do
+        render "default/empty"
+      end
+    end
+  end
+
   protected
 
+  def ensure_logged_in
+    raise Discourse::NotLoggedIn.new unless current_user.present?
+  end
+
+  def guardian
+    @guardian ||= Guardian.new(current_user, request)
+  end
+
   def wizard
     @wizard ||= begin
-      return nil unless @builder.present?
-      @builder.build({ reset: params[:reset] }, params)
+      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
+
+  def wizard_page_title
+    wizard ? (wizard.name || wizard.id) : I18n.t('wizard.custom_title')
+  end
+
+  def wizard_theme_id
+    wizard ? wizard.theme_id : nil
+  end
+
+  def wizard_theme_lookup(name)
+    Theme.lookup_field(wizard_theme_id, view_context.mobile_view? ? :mobile : :desktop, name)
+  end
+
+  def wizard_theme_translations_lookup
+    Theme.lookup_field(wizard_theme_id, :translations, I18n.locale)
+  end
+
+  def preload_wizard_json
+    return if request.xhr? || request.format.json?
+    return if request.method != "GET"
+
+    store_preloaded("siteSettings", SiteSetting.client_settings_json)
+  end
+
+  def store_preloaded(key, json)
+    @preloaded ||= {}
+    @preloaded[key] = json.gsub("</", "<\\/")
+  end
+
+  ## Simplified version of with_resolved_locale in ApplicationController
+  def with_resolved_locale
+    locale = current_user ? current_user.effective_locale : SiteSetting.default_locale
+    I18n.ensure_all_loaded!
+    I18n.with_locale(locale) { yield }
+  end
+
+  private
+
+  def ensure_plugin_enabled
+    unless SiteSetting.custom_wizard_enabled
+      redirect_to path("/")
     end
   end
 end

app/controllers/custom_wizard/wizard_client.rb

@@ -1,23 +0,0 @@
-# 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/serializers/custom_wizard/log_serializer.rb

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

app/serializers/custom_wizard/submission_serializer.rb

@@ -1,35 +1,16 @@
 # frozen_string_literal: true
 class CustomWizard::SubmissionSerializer < ApplicationSerializer
   attributes :id,
+             :username,
              :fields,
              :submitted_at,
-             :user
+             :route_to,
+             :redirect_on_complete,
+             :redirect_to
 
-  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
+  def username
+    object.user.present? ?
+    object.user.username :
+    I18n.t('admin.wizard.submission.no_user', user_id: object.user_id)
   end
 end

app/serializers/custom_wizard/wizard_field_serializer.rb

@@ -17,7 +17,6 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
              :property,
              :content,
              :tag_groups,
-             :can_create_tag,
              :validations,
              :max_length,
              :char_counter,
@@ -43,8 +42,13 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
     object.value
   end
 
+  def i18n_key
+    @i18n_key ||= "wizard.step.#{object.step.id}.fields.#{object.id}".underscore
+  end
+
   def label
-    I18n.t("#{i18n_key}.label", default: object.label, base_url: Discourse.base_url)
+    return object.label if object.label.present?
+    I18n.t("#{object.key || i18n_key}.label", default: '')
   end
 
   def include_label?
@@ -52,21 +56,14 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
   end
 
   def description
-    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
+    return object.description if object.description.present?
+    I18n.t("#{object.key || i18n_key}.description", default: '', 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
@@ -75,6 +72,15 @@ 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
@@ -99,10 +105,6 @@ 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|
@@ -125,14 +127,4 @@ 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

app/serializers/custom_wizard/wizard_serializer.rb

@@ -9,10 +9,13 @@ 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?
@@ -43,4 +46,24 @@ 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 { |c| c.to_h }
+  end
 end

app/serializers/custom_wizard/wizard_step_serializer.rb

@@ -39,8 +39,13 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
     object.previous.present?
   end
 
+  def i18n_key
+    @i18n_key ||= "wizard.step.#{object.id}".underscore
+  end
+
   def title
-    I18n.t("#{i18n_key}.title", default: object.title, base_url: Discourse.base_url)
+    return PrettyText.cook(object.title) if object.title
+    PrettyText.cook(I18n.t("#{object.key || i18n_key}.title", default: ''))
   end
 
   def include_title?
@@ -48,7 +53,8 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
   end
 
   def description
-    I18n.t("#{i18n_key}.description", default: object.description, base_url: Discourse.base_url)
+    return object.description if object.description
+    PrettyText.cook(I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url))
   end
 
   def include_description?
@@ -74,10 +80,4 @@ class CustomWizard::StepSerializer < ::ApplicationSerializer
   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

@@ -1,28 +0,0 @@
-<!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>

app/views/layouts/wizard.html.erb

@@ -0,0 +1,62 @@
+<html>
+  <head>
+    <%= discourse_color_scheme_stylesheets %>
+
+    <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %>
+    <%= discourse_stylesheet_link_tag :wizard_custom %>
+    <%- if wizard_theme_id.present? %>
+      <%= discourse_stylesheet_link_tag (mobile_view? ? :mobile_theme : :desktop_theme), theme_id: wizard_theme_id %>
+    <%- end %>
+
+    <%= preload_script "locales/#{I18n.locale}" %>
+    <%= 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_url ExtraLocalesController.url("wizard") %>
+    <%= csrf_meta_tags %>
+
+    <%- unless customization_disabled? %>
+      <%= wizard_theme_translations_lookup %>
+      <%= raw wizard_theme_lookup("head_tag") %>
+    <%- end %>
+
+    <%= server_plugin_outlet "custom_wizard" %>
+
+    <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
+
+    <meta name="discourse_theme_id" content="<%= wizard_theme_id %>">
+    <meta name="discourse-base-uri" content="<%= Discourse.base_path %>">
+
+    <%= render partial: "layouts/head" %>
+    <title><%= wizard_page_title %></title>
+  </head>
+
+  <body class='custom-wizard wizard'>
+    <%- unless customization_disabled? %>
+      <%= raw wizard_theme_lookup("header") %>
+    <%- end %>
+
+    <div id='custom-wizard-main'></div>
+
+    <%- unless customization_disabled? %>
+      <%= raw wizard_theme_lookup("body_tag") %>
+    <%- end %>
+
+    <%- if current_user %>
+      <%= preload_script 'wizard-custom-start' %>
+    <%- else %>
+      <%= preload_script 'wizard-custom-guest' %>
+    <%- end %>
+
+    <div id="svg-sprites" style="display:none;">
+      <div class="fontawesome">
+        <%= raw SvgSprite.bundle %>
+      </div>
+    </div>
+
+    <div class="hidden" id="data-preloaded-wizard" data-preloaded-wizard="<%= preloaded_json %>"></div>
+  </body>
+</html>

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

@@ -3,12 +3,27 @@ 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"),
@@ -25,13 +40,9 @@ export default Component.extend({
     const serializers = this.get(`${klass}Serializers`);
 
     if (serializers) {
-      return serializers.reduce((result, key) => {
-        result.push({
-          id: key,
-          name: I18n.t(`admin.wizard.custom_field.serializers.${key}`),
-        });
-        return result;
-      }, []);
+      return generateContent(serializers, "serializers");
+    } else {
+      return [];
     }
   },
 

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,34 +0,0 @@
-<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

@@ -1,15 +0,0 @@
-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

@@ -1,20 +0,0 @@
-<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

@@ -1,30 +0,0 @@
-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/wizard-advanced-toggle.js.es6

@@ -0,0 +1,21 @@
+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,7 +1,8 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { empty, equal, or } from "@ember/object/computed";
+import { and, 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";
@@ -15,7 +16,6 @@ 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,6 +25,8 @@ 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",
@@ -34,14 +36,22 @@ 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_x.notification_level.${type}`),
+      name: I18n.t(
+        `admin.wizard.action.watch_categories.notification_level.${type}`
+      ),
     };
   }),
 
-  messageUrl: "https://discourse.pluginmanager.org/t/action-settings",
+  messageUrl: "https://thepavilion.io/t/2810",
 
   @discourseComputed("action.type")
   messageKey(type) {
@@ -91,14 +101,4 @@ 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");
-  },
 });

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

@@ -1,5 +1,5 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { equal, or } from "@ember/object/computed";
+import { alias, equal, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { selectKitContent } from "../lib/wizard";
 import UndoChanges from "../mixins/undo-changes";
@@ -27,7 +27,8 @@ export default Component.extend(UndoChanges, {
   isTextType: or("isText", "isTextarea", "isComposer"),
   isComposerPreview: equal("field.type", "composer_preview"),
   categoryPropertyTypes: selectKitContent(["id", "slug"]),
-  messageUrl: "https://discourse.pluginmanager.org/t/field-settings",
+  showAdvanced: alias("field.type"),
+  messageUrl: "https://thepavilion.io/t/2809",
 
   @discourseComputed("field.type")
   validations(type) {
@@ -143,17 +144,11 @@ export default Component.extend(UndoChanges, {
 
   actions: {
     imageUploadDone(upload) {
-      this.setProperties({
-        "field.image": upload.url,
-        "field.image_upload_id": upload.id,
-      });
+      this.set("field.image", upload.url);
     },
 
     imageUploadDeleted() {
-      this.setProperties({
-        "field.image": null,
-        "field.image_upload_id": null,
-      });
+      this.set("field.image", null);
     },
   },
 });

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

@@ -24,17 +24,11 @@ export default Component.extend({
 
   actions: {
     bannerUploadDone(upload) {
-      this.setProperties({
-        "step.banner": upload.url,
-        "step.banner_upload_id": upload.id,
-      });
+      this.set("step.banner", upload.url);
     },
 
     bannerUploadDeleted() {
-      this.setProperties({
-        "step.banner": null,
-        "step.banner_upload_id": null,
-      });
+      this.set("step.banner", null);
     },
   },
 });

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

@@ -71,17 +71,6 @@ 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");
@@ -89,7 +78,7 @@ export default Component.extend({
       let params = setWizardDefaults({}, itemType);
 
       params.isNew = true;
-      params.index = this.getNextIndex();
+      params.index = items.length;
 
       let id = `${itemType}_${params.index + 1}`;
       if (itemType === "field") {

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

@@ -15,7 +15,6 @@ import {
 import Component from "@ember/component";
 import { bind, later } from "@ember/runloop";
 import I18n from "I18n";
-import Subscription from "../mixins/subscription";
 
 const customFieldActionMap = {
   topic: ["create_topic", "send_message"],
@@ -27,7 +26,7 @@ const customFieldActionMap = {
 
 const values = ["present", "true", "false"];
 
-export default Component.extend(Subscription, {
+export default Component.extend({
   classNameBindings: [":mapper-selector", "activeType"],
 
   showText: computed("activeType", function () {
@@ -117,9 +116,6 @@ export default Component.extend(Subscription, {
   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");
   }),
@@ -130,29 +126,7 @@ export default Component.extend(Subscription, {
     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;
-  },
+  groups: alias("site.groups"),
   categories: alias("site.categories"),
   showComboBox: or(
     "showWizardField",
@@ -403,7 +377,7 @@ export default Component.extend(Subscription, {
       this.changeValue(event.target.value);
     },
 
-    changeUserValue(value) {
+    changeUserValue(previousValue, value) {
       this.changeValue(value);
     },
   },

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

@@ -32,7 +32,6 @@ export default Component.extend({
       pairConnector: options.pairConnector || null,
       outputConnector: options.outputConnector || null,
       context: options.context || null,
-      guestGroup: options.guestGroup || false,
     };
 
     let inputTypes = ["key", "value", "output"];

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

@@ -6,7 +6,6 @@ import I18n from "I18n";
 const icons = {
   error: "times-circle",
   success: "check-circle",
-  warn: "exclamation-circle",
   info: "info-circle",
 };
 

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

@@ -6,8 +6,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
-  classNames: ["realtime-validations", "setting", "full", "subscription"],
-
+  classNames: ["realtime-validations"],
   @discourseComputed
   timeUnits() {
     return ["days", "weeks", "months", "years"].map((unit) => {

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

@@ -1,30 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,96 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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;
-  },
-});

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

@@ -1,139 +0,0 @@
-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}`;
-    }
-  },
-});

assets/javascripts/discourse/components/wizard-text-editor.js.es6

@@ -5,7 +5,11 @@ import { scheduleOnce } from "@ember/runloop";
 import Component from "@ember/component";
 import I18n from "I18n";
 
-const excludedUserProperties = ["profile_background", "card_background"];
+const excludedUserProperties = [
+  "avatar",
+  "profile_background",
+  "card_background",
+];
 
 export default Component.extend({
   classNames: "wizard-text-editor",
@@ -48,12 +52,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: {

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

@@ -1,7 +1,3 @@
 {{#if currentUser.admin}}
   {{nav-item route="adminWizards" label="admin.wizard.nav_label"}}
-
-  {{#if wizardErrorNotice}}
-    {{d-icon "exclaimation-circle"}}
-  {{/if}}
-{{/if}}
+{{/if}}

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

@@ -6,10 +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>
+</section>

assets/javascripts/discourse/connectors/category-custom-settings/custom-wizard-category-settings.js.es6

@@ -1,9 +1,9 @@
-import CustomWizardAdmin from "../../models/custom-wizard-admin";
+import CustomWizard from "../../models/custom-wizard";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default {
   setupComponent(attrs, component) {
-    CustomWizardAdmin.all()
+    CustomWizard.all()
       .then((result) => {
         component.set("wizardList", result);
       })

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

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

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

@@ -4,18 +4,14 @@ import CustomWizardApi from "../models/custom-wizard-api";
 import { default as discourseComputed } from "discourse-common/utils/decorators";
 import { and, equal, not } from "@ember/object/computed";
 import { selectKitContent } from "../lib/wizard";
-import { underscore } from "@ember/string";
 import Controller from "@ember/controller";
 import I18n from "I18n";
-import { inject as service } from "@ember/service";
 
 export default Controller.extend({
-  router: service(),
-
   queryParams: ["refresh_list"],
   loadingSubscriptions: false,
   notAuthorized: not("api.authorized"),
-  endpointMethods: selectKitContent(["PUT", "POST", "PATCH", "DELETE"]),
+  endpointMethods: selectKitContent(["GET", "PUT", "POST", "PATCH", "DELETE"]),
   showRemove: not("isNew"),
   showRedirectUri: and("threeLeggedOauth", "api.name"),
   responseIcon: null,
@@ -24,8 +20,29 @@ export default Controller.extend({
     "application/x-www-form-urlencoded",
   ]),
   successCodes: selectKitContent([
-    100, 101, 102, 200, 201, 202, 203, 204, 205, 206, 207, 208, 226, 300, 301,
-    302, 303, 303, 304, 305, 306, 307, 308,
+    100,
+    101,
+    102,
+    200,
+    201,
+    202,
+    203,
+    204,
+    205,
+    206,
+    207,
+    208,
+    226,
+    300,
+    301,
+    302,
+    303,
+    303,
+    304,
+    305,
+    306,
+    307,
+    308,
   ]),
 
   @discourseComputed(
@@ -71,11 +88,6 @@ 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({});
@@ -101,7 +113,7 @@ export default Controller.extend({
 
       if (authType === "oauth_2") {
         this.set("authorizing", true);
-        ajax(`/admin/wizards/apis/${underscore(name)}/authorize`)
+        ajax(`/admin/wizards/apis/${name.underscore()}/authorize`)
           .catch(popupAjaxError)
           .then((result) => {
             if (result.success) {
@@ -137,6 +149,7 @@ 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) {
@@ -151,6 +164,11 @@ 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;
       }
@@ -170,11 +188,11 @@ export default Controller.extend({
           if (!api[rp]) {
             let key = rp.replace("auth", "");
             error = `${I18n.t(
-              `admin.wizard.api.auth.${underscore(key)}`
+              `admin.wizard.api.auth.${key.underscore()}`
             )} is required for ${authType}`;
             break;
           }
-          data[underscore(rp)] = api[rp];
+          data[rp.underscore()] = api[rp];
         }
       }
 
@@ -204,7 +222,7 @@ export default Controller.extend({
 
       this.set("updating", true);
 
-      ajax(`/admin/wizards/api/${underscore(name)}`, {
+      ajax(`/admin/wizards/api/${name.underscore()}`, {
         type: "PUT",
         data,
       })
@@ -227,7 +245,7 @@ export default Controller.extend({
 
       this.set("updating", true);
 
-      ajax(`/admin/wizards/api/${underscore(name)}`, {
+      ajax(`/admin/wizards/api/${name.underscore()}`, {
         type: "DELETE",
       })
         .catch(popupAjaxError)
@@ -245,13 +263,13 @@ export default Controller.extend({
         return;
       }
 
-      ajax(`/admin/wizards/api/${underscore(name)}/logs`, {
+      ajax(`/admin/wizards/api/${name.underscore()}/logs`, {
         type: "DELETE",
       })
         .catch(popupAjaxError)
         .then((result) => {
           if (result.success) {
-            this.router.transitionTo("adminWizardsApis").then(() => {
+            this.transitionToRoute("adminWizardsApis").then(() => {
               this.send("refreshModel");
             });
           }

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://discourse.pluginmanager.org/t/custom-fields",
+  documentationUrl: "https://thepavilion.io/t/3572",
 
   actions: {
     addField() {

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

@@ -1,52 +0,0 @@
-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();
-    },
-  },
-});

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

@@ -1,34 +1,50 @@
+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({
-  documentationUrl: "https://thepavilion.io/t/2818",
+  refreshing: false,
+  hasLogs: notEmpty("logs"),
+  page: 0,
+  canLoadMore: true,
+  logs: [],
 
-  @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";
+  loadLogs() {
+    if (!this.canLoadMore) {
+      return;
     }
 
-    return key;
+    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();
+    },
   },
 });

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://discourse.pluginmanager.org/t/wizard-manager",
+  messageUrl: "https://thepavilion.io/t/3652",
   messageKey: "info",
   messageIcon: "info-circle",
   messageClass: "info",
@@ -68,7 +68,7 @@ export default Controller.extend({
       file: null,
       filename: null,
     });
-    document.getElementById("custom-wizard-file-upload").value = "";
+    $("#file-upload").val("");
   },
 
   @observes("importing", "destroying")
@@ -83,7 +83,7 @@ export default Controller.extend({
 
   actions: {
     upload() {
-      document.getElementById("custom-wizard-file-upload").click();
+      $("#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);
-        document.getElementById("custom-wizard-file-upload").value = "";
+        $("#file-upload").val("");
       } else {
         this.setProperties({
           file,

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

@@ -1,74 +1,6 @@
 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 { inject as service } from "@ember/service";
-import AdminWizardsColumnsModal from "../components/modal/admin-wizards-columns";
-import CustomWizardAdmin from "../models/custom-wizard-admin";
-import { formatModel } from "../lib/wizard-submission";
 
 export default Controller.extend({
-  modal: service(),
   downloadUrl: fmt("wizard.id", "/admin/wizards/submissions/%@/download"),
-  noResults: empty("submissions"),
-  page: 0,
-  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 this.modal.show(AdminWizardsColumnsModal, {
-        model: {
-          columns: this.get("fields"),
-          reset: () => {
-            this.get("fields").forEach((field) => {
-              field.set("enabled", true);
-            });
-          },
-        },
-      });
-    },
-  },
 });

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

@@ -1,34 +0,0 @@
-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;
-  },
-});

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

@@ -3,18 +3,15 @@ import {
   observes,
 } from "discourse-common/utils/decorators";
 import { notEmpty } from "@ember/object/computed";
-import { inject as service } from "@ember/service";
-import NextSessionScheduledModal from "../components/modal/next-session-scheduled";
+import showModal from "discourse/lib/show-modal";
 import { generateId, wizardFieldList } from "../lib/wizard";
 import { dasherize } from "@ember/string";
 import { later, scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import copyText from "discourse/lib/copy-text";
 import I18n from "I18n";
-import { filterValues } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
 
 export default Controller.extend({
-  modal: service(),
   hasName: notEmpty("wizard.name"),
 
   @observes("currentStep")
@@ -39,8 +36,7 @@ export default Controller.extend({
 
   @discourseComputed("wizard.id")
   wizardUrl(wizardId) {
-    let baseUrl = window.location.href.split("/admin");
-    return baseUrl[0] + "/w/" + dasherize(wizardId);
+    return window.location.origin + "/w/" + dasherize(wizardId);
   },
 
   @discourseComputed("wizard.after_time_scheduled")
@@ -62,19 +58,6 @@ export default Controller.extend({
     }
     return wizardFieldList(steps);
   },
-
-  @discourseComputed("fieldTypes", "wizard.allowGuests")
-  filteredFieldTypes(fieldTypes) {
-    const fieldTypeIds = fieldTypes.map((f) => f.id);
-    const allowedTypeIds = filterValues(
-      this.wizard,
-      "field",
-      "type",
-      fieldTypeIds
-    );
-    return fieldTypes.filter((f) => allowedTypeIds.includes(f.id));
-  },
-
   getErrorMessage(result) {
     if (result.backend_validation_error) {
       return result.backend_validation_error;
@@ -109,11 +92,7 @@ export default Controller.extend({
       wizard
         .save(opts)
         .then((result) => {
-          if (result.wizard_id) {
-            this.send("afterSave", result.wizard_id);
-          } else if (result.errors) {
-            this.set("error", result.errors.join(", "));
-          }
+          this.send("afterSave", result.wizard_id);
         })
         .catch((result) => {
           this.set("error", this.getErrorMessage(result));
@@ -128,13 +107,19 @@ export default Controller.extend({
     },
 
     setNextSessionScheduled() {
-      this.modal.show(NextSessionScheduledModal, {
+      let controller = showModal("next-session-scheduled", {
         model: {
           dateTime: this.wizard.after_time_scheduled,
           update: (dateTime) =>
             this.set("wizard.after_time_scheduled", dateTime),
         },
       });
+
+      controller.setup();
+    },
+
+    toggleAdvanced() {
+      this.toggleProperty("wizard.showAdvanced");
     },
 
     copyUrl() {

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

@@ -21,6 +21,5 @@ export default Controller.extend({
     return key;
   },
 
-  messageUrl:
-    "https://discourse.pluginmanager.org/c/discourse-custom-wizard/documentation",
+  messageUrl: "https://thepavilion.io/c/knowledge/discourse/custom-wizard",
 });

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

@@ -1,9 +0,0 @@
-import Controller from "@ember/controller";
-import { equal, or } from "@ember/object/computed";
-
-export default Controller.extend({
-  businessSubscription: equal("subscriptionType", "business"),
-  communitySubscription: equal("subscriptionType", "community"),
-  standardSubscription: equal("subscriptionType", "standard"),
-  showApi: or("businessSubscription", "communitySubscription"),
-});

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

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

assets/javascripts/discourse/custom-wizard-admin-route-map.js.es6

@@ -43,16 +43,7 @@ export default {
           }
         );
 
-        this.route(
-          "adminWizardsLogs",
-          { path: "/logs", resetNamespace: true },
-          function () {
-            this.route("adminWizardsLogsShow", {
-              path: "/:wizardId/",
-              resetNamespace: true,
-            });
-          }
-        );
+        this.route("adminWizardsLogs", { path: "/logs", resetNamespace: true });
 
         this.route("adminWizardsManager", {
           path: "/manager",

assets/javascripts/discourse/custom-wizard-route-map.js.es6

@@ -1,12 +0,0 @@
-export default function () {
-  this.route(
-    "customWizard",
-    { path: "/w/:wizard_id", resetNamespace: true },
-    function () {
-      this.route("customWizardStep", {
-        path: "/steps/:step_id",
-        resetNamespace: true,
-      });
-    }
-  );
-}

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

@@ -0,0 +1,6 @@
+import { registerUnbound } from "discourse-common/lib/helpers";
+import { dasherize } from "@ember/string";
+
+registerUnbound("dasherize", function (string) {
+  return dasherize(string);
+});

assets/javascripts/discourse/helpers/wizard-char-counter.js.es6

@@ -1,25 +0,0 @@
-import { registerUnbound } from "discourse-common/lib/helpers";
-import I18n from "I18n";
-import Handlebars from "handlebars";
-
-export default registerUnbound(
-  "wizard-char-counter",
-  function (body, maxLength) {
-    let bodyLength = body ? body.length : 0;
-    let finalString;
-
-    if (maxLength) {
-      let isOverMax = bodyLength > maxLength ? "true" : "false";
-      finalString = `<div class="body-length" data-length=${bodyLength} data-over-max=${isOverMax}>${bodyLength} / ${I18n.t(
-        "wizard.x_characters",
-        { count: parseInt(maxLength, 10) }
-      )}</div>`;
-    } else {
-      finalString = `<div class="body-length">${I18n.t("wizard.x_characters", {
-        count: parseInt(bodyLength, 10),
-      })}</div>`;
-    }
-
-    return new Handlebars.SafeString(finalString);
-  }
-);

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

@@ -6,7 +6,7 @@ import { observes } from "discourse-common/utils/decorators";
 export default {
   name: "custom-wizard-edits",
   initialize(container) {
-    const siteSettings = container.lookup("service:site-settings");
+    const siteSettings = container.lookup("site-settings:main");
 
     if (!siteSettings.custom_wizard_enabled) {
       return;
@@ -20,7 +20,7 @@ export default {
       return existing.apply(this, [path, opts]);
     };
 
-    withPluginApi("0.8.36", (api) => {
+    withPluginApi("0.8.7", (api) => {
       api.modifyClass("component:d-navigation", {
         pluginId: "custom-wizard",
         actions: {
@@ -38,7 +38,6 @@ export default {
       });
 
       api.modifyClass("component:uppy-image-uploader", {
-        pluginId: "custom-wizard",
         // Needed to ensure appEvents get registered when navigating between steps
         @observes("id")
         initOnStepChange() {
@@ -47,52 +46,6 @@ export default {
           }
         },
       });
-
-      api.modifyClass("component:d-editor", {
-        pluginId: "custom-wizard",
-
-        didInsertElement() {
-          this._super(...arguments);
-
-          if (this.wizardComposer) {
-            this.appEvents.on(
-              `wizard-editor:insert-text`,
-              this,
-              "_wizardInsertText"
-            );
-            this.appEvents.on(
-              "wizard-editor:replace-text",
-              this,
-              "_wizardReplaceText"
-            );
-          }
-        },
-
-        _wizardInsertText(text, options) {
-          if (
-            this.session.wizardEventFieldId === this.fieldId &&
-            this.element
-          ) {
-            this.insertText(text, options);
-          }
-        },
-
-        _wizardReplaceText(oldVal, newVal, opts = {}) {
-          if (this.session.wizardEventFieldId === this.fieldId) {
-            this.replaceText(oldVal, newVal, opts);
-          }
-        },
-      });
-
-      api.modifyClass("component:category-chooser", {
-        categoriesByScope(options = {}) {
-          let categories = this._super(options);
-
-          return categories.filter((category) => {
-            return !category.custom_fields?.create_topic_wizard;
-          });
-        },
-      });
     });
   },
 };

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

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

assets/javascripts/discourse/lib/wizard-json.js.es6

@@ -97,6 +97,11 @@ function buildObjectArray(json, type) {
   if (present(json)) {
     json.forEach((objJson, objectIndex) => {
       let object = buildObject(objJson, type, objectIndex);
+
+      if (hasAdvancedProperties(object, type)) {
+        object.set("showAdvanced", true);
+      }
+
       array.pushObject(object);
     });
   }
@@ -107,11 +112,21 @@ function buildObjectArray(json, type) {
 function buildBasicProperties(json, type, props, objectIndex = null) {
   listProperties(type).forEach((p) => {
     props[p] = buildProperty(json, p, type, objectIndex);
+
+    if (hasAdvancedProperties(json, type)) {
+      props.showAdvanced = true;
+    }
   });
 
   return props;
 }
 
+function hasAdvancedProperties(object, type) {
+  return Object.keys(object).some((p) => {
+    return wizardSchema[type].advanced.indexOf(p) > -1 && present(object[p]);
+  });
+}
+
 /// to be removed: necessary due to action array being moved from step to wizard
 function actionPatch(json) {
   let actions = json.actions || [];

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

@@ -35,7 +35,6 @@ function inputTypesContent(options = {}) {
 const connectors = {
   pair: [
     "equal",
-    "not_equal",
     "greater",
     "less",
     "greater_or_equal",

assets/javascripts/discourse/lib/wizard-schema.js.es6

@@ -19,6 +19,7 @@ const wizard = {
     permitted: null,
   },
   mapped: ["permitted"],
+  advanced: ["restart_on_revisit"],
   required: ["id"],
   dependent: {
     after_time: "after_time_scheduled",
@@ -40,8 +41,8 @@ const step = {
     id: null,
     index: null,
     title: null,
+    key: null,
     banner: null,
-    banner_upload_id: null,
     raw_description: null,
     required_data: null,
     required_data_message: null,
@@ -50,6 +51,7 @@ const step = {
     force_final: false,
   },
   mapped: ["required_data", "permitted_params", "condition", "index"],
+  advanced: ["required_data", "permitted_params", "condition", "index"],
   required: ["id"],
   dependent: {},
   objectArrays: {
@@ -66,16 +68,15 @@ const field = {
     index: null,
     label: null,
     image: null,
-    image_upload_id: null,
     description: null,
-    property: null,
     required: null,
+    key: null,
     type: null,
     condition: null,
-    tag_groups: null,
   },
   types: {},
   mapped: ["prefill", "content", "condition", "index"],
+  advanced: ["property", "key", "condition", "index"],
   required: ["id", "type"],
   dependent: {},
   objectArrays: {},
@@ -99,8 +100,6 @@ const action = {
       custom_fields: null,
       skip_redirect: null,
       suppress_notifications: null,
-      add_event: null,
-      add_location: null,
     },
     send_message: {
       title: null,
@@ -133,12 +132,6 @@ const action = {
       wizard_user: true,
       usernames: null,
     },
-    watch_tags: {
-      tags: null,
-      notification_level: null,
-      wizard_user: true,
-      usernames: null,
-    },
     send_to_api: {
       api: null,
       api_endpoint: null,
@@ -203,83 +196,35 @@ const action = {
     "messageable_level",
     "visibility_level",
     "members_visibility_level",
-    "add_event",
-    "add_location",
+  ],
+  advanced: [
+    "code",
+    "custom_fields",
+    "skip_redirect",
+    "suppress_notifications",
+    "required",
   ],
   required: ["id", "type"],
   dependent: {},
   objectArrays: {},
 };
 
-const filters = {
-  allow_guests: {
-    field: {
-      type: [
-        "text",
-        "textarea",
-        "text_only",
-        "date",
-        "time",
-        "date_time",
-        "number",
-        "checkbox",
-        "url",
-        "dropdown",
-        "tag",
-        "category",
-        "group",
-        "user_selector",
-      ],
-    },
-    action: {
-      type: ["route_to", "send_message"],
-    },
-  },
-};
-
-const custom_field = {
-  klass: ["topic", "post", "group", "category"],
-  type: ["string", "boolean", "integer", "json"],
-};
-
-export function buildFieldTypes(types) {
-  wizardSchema.field.types = types;
-  wizardSchema.field.type = Object.keys(types);
-}
-
-field.type = Object.keys(field.types);
-action.type = Object.keys(action.types);
-
 const wizardSchema = {
   wizard,
   step,
   field,
-  custom_field,
   action,
-  filters,
 };
 
+export function buildFieldTypes(types) {
+  wizardSchema.field.types = types;
+}
+
 export function buildFieldValidations(validations) {
   wizardSchema.field.validations = validations;
 }
 
-export function filterValues(currentWizard, feature, attribute, values = null) {
-  values = values || wizardSchema[feature][attribute];
-
-  if (currentWizard && currentWizard.allowGuests) {
-    const filteredFeature = wizardSchema.filters.allow_guests[feature];
-    if (filteredFeature) {
-      const filtered = filteredFeature[attribute];
-      if (filtered) {
-        values = values.filter((v) => filtered.includes(v));
-      }
-    }
-  }
-
-  return values;
-}
-
-const siteSettings = getOwner(this).lookup("service:site-settings");
+const siteSettings = getOwner(this).lookup("site-settings:main");
 if (siteSettings.wizard_apis_enabled) {
   wizardSchema.action.types.send_to_api = {
     api: null,

assets/javascripts/discourse/lib/wizard-submission.js.es6

@@ -1,39 +0,0 @@
-import EmberObject from "@ember/object";
-
-function formatModel(model) {
-  let fields = [
-    EmberObject.create({
-      id: "submitted_at",
-      label: "Submitted At",
-      enabled: true,
-    }),
-    EmberObject.create({ id: "username", label: "User", enabled: true }),
-  ];
-  let submissions = [];
-
-  model.submissions.forEach((s) => {
-    let submission = {
-      submitted_at: s.submitted_at,
-      username: s.user,
-    };
-
-    Object.keys(s.fields).forEach((fieldId) => {
-      if (!fields.some((field) => field.id === fieldId)) {
-        fields.push(
-          EmberObject.create({
-            id: fieldId,
-            label: s.fields[fieldId].label,
-            enabled: true,
-          })
-        );
-      }
-      submission[fieldId] = s.fields[fieldId];
-    });
-
-    submissions.push(EmberObject.create(submission));
-  });
-
-  return { fields, submissions };
-}
-
-export { formatModel };

assets/javascripts/discourse/lib/wizard.js.es6

@@ -1,6 +1,5 @@
 import EmberObject from "@ember/object";
 import wizardSchema from "./wizard-schema";
-import I18n from "I18n";
 
 function selectKitContent(content) {
   return content.map((i) => ({ id: i, name: i }));
@@ -34,10 +33,6 @@ function camelCase(string) {
   });
 }
 
-function translationOrText(i18nKey, text) {
-  return I18n.findTranslation(i18nKey) ? I18n.t(i18nKey) : text;
-}
-
 const userProperties = [
   "name",
   "username",
@@ -126,5 +121,4 @@ export {
   notificationLevels,
   wizardFieldList,
   sentenceCase,
-  translationOrText,
 };

assets/javascripts/discourse/mixins/subscription.js.es6

@@ -1,53 +0,0 @@
-import Mixin from "@ember/object/mixin";
-import { getOwner } from "discourse-common/lib/get-owner";
-import { readOnly } from "@ember/object/computed";
-import discourseComputed from "discourse-common/utils/decorators";
-
-const PRODUCT_PAGE = "https://custom-wizard.pavilion.tech";
-const SUPPORT_MESSAGE =
-  "https://coop.pavilion.tech/new-message?username=support&title=Custom%20Wizard%20Support";
-const MANAGER_CATEGORY =
-  "https://discourse.pluginmanager.org/c/discourse-custom-wizard";
-
-export default Mixin.create({
-  subscriptionLandingUrl: PRODUCT_PAGE,
-  subscriptionClientUrl: "/admin/plugins/subscription-client",
-
-  @discourseComputed
-  adminWizards() {
-    return getOwner(this).lookup("controller:admin-wizards");
-  },
-
-  subscribed: readOnly("adminWizards.subscribed"),
-  subscriptionType: readOnly("adminWizards.subscriptionType"),
-  businessSubscription: readOnly("adminWizards.businessSubscription"),
-  communitySubscription: readOnly("adminWizards.communitySubscription"),
-  standardSubscription: readOnly("adminWizards.standardSubscription"),
-  subscriptionAttributes: readOnly("adminWizards.subscriptionAttributes"),
-  subscriptionClientInstalled: readOnly(
-    "adminWizards.subscriptionClientInstalled"
-  ),
-
-  @discourseComputed("subscriptionClientInstalled")
-  subscriptionLink(subscriptionClientInstalled) {
-    return subscriptionClientInstalled
-      ? this.subscriptionClientUrl
-      : this.subscriptionLandingUrl;
-  },
-
-  @discourseComputed("subscriptionType")
-  subscriptionCtaLink(subscriptionType) {
-    switch (subscriptionType) {
-      case "none":
-        return PRODUCT_PAGE;
-      case "standard":
-        return SUPPORT_MESSAGE;
-      case "business":
-        return SUPPORT_MESSAGE;
-      case "community":
-        return MANAGER_CATEGORY;
-      default:
-        return PRODUCT_PAGE;
-    }
-  },
-});

assets/javascripts/discourse/mixins/undo-changes.js.es6

@@ -4,8 +4,6 @@ import { get, set } from "@ember/object";
 import Mixin from "@ember/object/mixin";
 import { deepEqual } from "discourse-common/lib/object";
 
-const observedCache = [];
-
 export default Mixin.create({
   didInsertElement() {
     this._super(...arguments);
@@ -34,13 +32,7 @@ export default Mixin.create({
     };
 
     listProperties(componentType, opts).forEach((property) => {
-      if (observedCache.includes(property)) {
-        obj.removeObserver(property, this, this.toggleUndo);
-        let index = observedCache.indexOf(property);
-        if (index !== -1) {
-          observedCache.splice(index, 1);
-        }
-      }
+      obj.removeObserver(property, this, this.toggleUndo);
     });
   },
 
@@ -53,9 +45,6 @@ export default Mixin.create({
     };
 
     listProperties(componentType, opts).forEach((property) => {
-      if (observedCache.indexOf(property) === -1) {
-        observedCache.push(property);
-      }
       obj.addObserver(property, this, this.toggleUndo);
     });
   },

assets/javascripts/discourse/models/custom-wizard-admin.js.es6

@@ -1,242 +0,0 @@
-import EmberObject from "@ember/object";
-import { buildProperties, mapped, present } from "../lib/wizard-json";
-import { listProperties, snakeCase } from "../lib/wizard";
-import wizardSchema from "../lib/wizard-schema";
-import { Promise } from "rsvp";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed from "discourse-common/utils/decorators";
-
-const GUEST_GROUP_ID = -1;
-
-const CustomWizardAdmin = EmberObject.extend({
-  @discourseComputed("permitted.@each.output")
-  allowGuests(permitted) {
-    return (
-      permitted &&
-      permitted.filter((p) => p.output && p.output.includes(GUEST_GROUP_ID))
-        .length
-    );
-  },
-
-  save(opts) {
-    return new Promise((resolve, reject) => {
-      let wizard = this.buildJson(this, "wizard");
-
-      if (wizard.error) {
-        reject(wizard);
-      }
-
-      let data = {
-        wizard,
-      };
-
-      if (opts.create) {
-        data.create = true;
-      }
-
-      ajax(`/admin/wizards/wizard/${wizard.id}`, {
-        type: "PUT",
-        contentType: "application/json",
-        data: JSON.stringify(data),
-      }).then((result) => {
-        if (result.backend_validation_error) {
-          reject(result);
-        } else {
-          resolve(result);
-        }
-      });
-    });
-  },
-
-  buildJson(object, type, result = {}) {
-    let objectType = object.type || null;
-
-    if (wizardSchema[type].types) {
-      if (!objectType) {
-        result.error = {
-          type: "required",
-          params: { type, property: "type" },
-        };
-        return result;
-      }
-    }
-
-    for (let property of listProperties(type, { objectType })) {
-      let value = object.get(property);
-
-      result = this.validateValue(property, value, object, type, result);
-
-      if (result.error) {
-        break;
-      }
-
-      if (mapped(property, type)) {
-        value = this.buildMappedJson(value);
-      }
-
-      if (value !== undefined && value !== null) {
-        result[property] = value;
-      }
-    }
-
-    if (!result.error) {
-      for (let arrayObjectType of Object.keys(
-        wizardSchema[type].objectArrays
-      )) {
-        let arraySchema = wizardSchema[type].objectArrays[arrayObjectType];
-        let objectArray = object.get(arraySchema.property);
-
-        if (arraySchema.required && !present(objectArray)) {
-          result.error = {
-            type: "required",
-            params: { type, property: arraySchema.property },
-          };
-          break;
-        }
-
-        result[arraySchema.property] = [];
-
-        for (let item of objectArray) {
-          let itemProps = this.buildJson(item, arrayObjectType);
-
-          if (itemProps.error) {
-            result.error = itemProps.error;
-            break;
-          } else {
-            result[arraySchema.property].push(itemProps);
-          }
-        }
-      }
-    }
-
-    return result;
-  },
-
-  validateValue(property, value, object, type, result) {
-    if (wizardSchema[type].required.indexOf(property) > -1 && !value) {
-      result.error = {
-        type: "required",
-        params: { type, property },
-      };
-    }
-
-    let dependent = wizardSchema[type].dependent[property];
-    if (dependent && value && !object[dependent]) {
-      result.error = {
-        type: "dependent",
-        params: { property, dependent },
-      };
-    }
-
-    if (property === "api_body") {
-      try {
-        value = JSON.parse(value);
-      } catch (e) {
-        result.error = {
-          type: "invalid",
-          params: { type, property },
-        };
-      }
-    }
-
-    return result;
-  },
-
-  buildMappedJson(value) {
-    if (typeof value === "string" || Number.isInteger(value)) {
-      return value;
-    }
-    if (!value || !value.length) {
-      return false;
-    }
-
-    let inputs = value;
-    let result = [];
-
-    inputs.forEach((inpt) => {
-      let input = {
-        type: inpt.type,
-      };
-
-      if (inpt.connector) {
-        input.connector = inpt.connector;
-      }
-
-      if (present(inpt.output)) {
-        input.output = inpt.output;
-        input.output_type = snakeCase(inpt.output_type);
-        input.output_connector = inpt.output_connector;
-      }
-
-      if (present(inpt.pairs)) {
-        input.pairs = [];
-
-        inpt.pairs.forEach((pr) => {
-          if (present(pr.key) && present(pr.value)) {
-            let pairParams = {
-              index: pr.index,
-              key: pr.key,
-              key_type: snakeCase(pr.key_type),
-              value: pr.value,
-              value_type: snakeCase(pr.value_type),
-              connector: pr.connector,
-            };
-
-            input.pairs.push(pairParams);
-          }
-        });
-      }
-
-      if (
-        (input.type === "assignment" && present(input.output)) ||
-        present(input.pairs)
-      ) {
-        result.push(input);
-      }
-    });
-
-    if (!result.length) {
-      result = false;
-    }
-
-    return result;
-  },
-
-  remove() {
-    return ajax(`/admin/wizards/wizard/${this.id}`, {
-      type: "DELETE",
-    })
-      .then(() => this.destroy())
-      .catch(popupAjaxError);
-  },
-});
-
-CustomWizardAdmin.reopenClass({
-  all() {
-    return ajax("/admin/wizards/wizard", {
-      type: "GET",
-    })
-      .then((result) => {
-        return result.wizard_list;
-      })
-      .catch(popupAjaxError);
-  },
-
-  submissions(wizardId, page = 0) {
-    return ajax(`/admin/wizards/submissions/${wizardId}`, {
-      type: "GET",
-      data: {
-        page,
-      },
-    }).catch(popupAjaxError);
-  },
-
-  create(wizardJson = {}) {
-    const wizard = this._super.apply(this);
-    wizard.setProperties(buildProperties(wizardJson));
-    return wizard;
-  },
-});
-
-export default CustomWizardAdmin;

assets/javascripts/discourse/models/custom-wizard-logs.js.es6

@@ -3,54 +3,14 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import EmberObject from "@ember/object";
 
 const CustomWizardLogs = EmberObject.extend();
-const logItemTypes = {
-  date: "date_time",
-  action: "text",
-  message: "long_text",
-  user: "user",
-  username: "text",
-};
-
-function logItem(item, attr) {
-  return {
-    value: item[attr],
-    type: logItemTypes[attr],
-  };
-}
 
 CustomWizardLogs.reopenClass({
-  list(wizardId, page = 0) {
-    let data = {
-      page,
-    };
-
-    return ajax(`/admin/wizards/logs/${wizardId}`, { data })
-      .catch(popupAjaxError)
-      .then((result) => {
-        if (result.logs) {
-          result.logs = result.logs.map((item) => {
-            let map = {};
-
-            if (item.date) {
-              map.date = logItem(item, "date");
-            }
-            if (item.action) {
-              map.action = logItem(item, "action");
-            }
-            if (item.user) {
-              map.user = item.user;
-            } else {
-              map.user = logItem(item, "username");
-            }
-            if (item.message) {
-              map.message = logItem(item, "message");
-            }
-
-            return map;
-          });
-        }
-        return result;
-      });
+  list(page = 0) {
+    return ajax("/admin/wizards/logs", {
+      data: {
+        page,
+      },
+    }).catch(popupAjaxError);
   },
 });
 

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

@@ -1,127 +1,227 @@
-import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";
+import { buildProperties, mapped, present } from "../lib/wizard-json";
+import { listProperties, snakeCase } from "../lib/wizard";
+import wizardSchema from "../lib/wizard-schema";
+import { Promise } from "rsvp";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed from "discourse-common/utils/decorators";
-import getUrl from "discourse-common/lib/get-url";
-import CustomWizardField from "./custom-wizard-field";
-import CustomWizardStep from "./custom-wizard-step";
 
 const CustomWizard = EmberObject.extend({
-  @discourseComputed("steps.length")
-  totalSteps: (length) => length,
+  save(opts) {
+    return new Promise((resolve, reject) => {
+      let wizard = this.buildJson(this, "wizard");
 
-  skip() {
-    if (this.required && !this.completed && this.permitted) {
-      return;
-    }
-    CustomWizard.skip(this.id);
+      if (wizard.error) {
+        reject(wizard);
+      }
+
+      let data = {
+        wizard,
+      };
+
+      if (opts.create) {
+        data.create = true;
+      }
+
+      ajax(`/admin/wizards/wizard/${wizard.id}`, {
+        type: "PUT",
+        contentType: "application/json",
+        data: JSON.stringify(data),
+      }).then((result) => {
+        if (result.backend_validation_error) {
+          reject(result);
+        } else {
+          resolve(result);
+        }
+      });
+    });
   },
 
-  restart() {
-    CustomWizard.restart(this.id);
+  buildJson(object, type, result = {}) {
+    let objectType = object.type || null;
+
+    if (wizardSchema[type].types) {
+      if (!objectType) {
+        result.error = {
+          type: "required",
+          params: { type, property: "type" },
+        };
+        return result;
+      }
+    }
+
+    for (let property of listProperties(type, { objectType })) {
+      let value = object.get(property);
+
+      result = this.validateValue(property, value, object, type, result);
+
+      if (result.error) {
+        break;
+      }
+
+      if (mapped(property, type)) {
+        value = this.buildMappedJson(value);
+      }
+
+      if (value !== undefined && value !== null) {
+        result[property] = value;
+      }
+    }
+
+    if (!result.error) {
+      for (let arrayObjectType of Object.keys(
+        wizardSchema[type].objectArrays
+      )) {
+        let arraySchema = wizardSchema[type].objectArrays[arrayObjectType];
+        let objectArray = object.get(arraySchema.property);
+
+        if (arraySchema.required && !present(objectArray)) {
+          result.error = {
+            type: "required",
+            params: { type, property: arraySchema.property },
+          };
+          break;
+        }
+
+        result[arraySchema.property] = [];
+
+        for (let item of objectArray) {
+          let itemProps = this.buildJson(item, arrayObjectType);
+
+          if (itemProps.error) {
+            result.error = itemProps.error;
+            break;
+          } else {
+            result[arraySchema.property].push(itemProps);
+          }
+        }
+      }
+    }
+
+    return result;
+  },
+
+  validateValue(property, value, object, type, result) {
+    if (wizardSchema[type].required.indexOf(property) > -1 && !value) {
+      result.error = {
+        type: "required",
+        params: { type, property },
+      };
+    }
+
+    let dependent = wizardSchema[type].dependent[property];
+    if (dependent && value && !object[dependent]) {
+      result.error = {
+        type: "dependent",
+        params: { property, dependent },
+      };
+    }
+
+    if (property === "api_body") {
+      try {
+        value = JSON.parse(value);
+      } catch (e) {
+        result.error = {
+          type: "invalid",
+          params: { type, property },
+        };
+      }
+    }
+
+    return result;
+  },
+
+  buildMappedJson(value) {
+    if (typeof value === "string" || Number.isInteger(value)) {
+      return value;
+    }
+    if (!value || !value.length) {
+      return false;
+    }
+
+    let inputs = value;
+    let result = [];
+
+    inputs.forEach((inpt) => {
+      let input = {
+        type: inpt.type,
+      };
+
+      if (inpt.connector) {
+        input.connector = inpt.connector;
+      }
+
+      if (present(inpt.output)) {
+        input.output = inpt.output;
+        input.output_type = snakeCase(inpt.output_type);
+        input.output_connector = inpt.output_connector;
+      }
+
+      if (present(inpt.pairs)) {
+        input.pairs = [];
+
+        inpt.pairs.forEach((pr) => {
+          if (present(pr.key) && present(pr.value)) {
+            let pairParams = {
+              index: pr.index,
+              key: pr.key,
+              key_type: snakeCase(pr.key_type),
+              value: pr.value,
+              value_type: snakeCase(pr.value_type),
+              connector: pr.connector,
+            };
+
+            input.pairs.push(pairParams);
+          }
+        });
+      }
+
+      if (
+        (input.type === "assignment" && present(input.output)) ||
+        present(input.pairs)
+      ) {
+        result.push(input);
+      }
+    });
+
+    if (!result.length) {
+      result = false;
+    }
+
+    return result;
+  },
+
+  remove() {
+    return ajax(`/admin/wizards/wizard/${this.id}`, {
+      type: "DELETE",
+    })
+      .then(() => this.destroy())
+      .catch(popupAjaxError);
   },
 });
 
 CustomWizard.reopenClass({
-  skip(wizardId) {
-    ajax({ url: `/w/${wizardId}/skip`, type: "PUT" })
+  all() {
+    return ajax("/admin/wizards/wizard", {
+      type: "GET",
+    })
       .then((result) => {
-        CustomWizard.finished(result);
+        return result.wizard_list;
       })
       .catch(popupAjaxError);
   },
 
-  restart(wizardId) {
-    ajax({ url: `/w/${wizardId}/skip`, type: "PUT" })
-      .then(() => {
-        window.location.href = `/w/${wizardId}`;
-      })
-      .catch(popupAjaxError);
+  submissions(wizardId) {
+    return ajax(`/admin/wizards/submissions/${wizardId}`, {
+      type: "GET",
+    }).catch(popupAjaxError);
   },
 
-  finished(result) {
-    let url = "/";
-    if (result.redirect_on_complete) {
-      url = result.redirect_on_complete;
-    }
-    window.location.href = getUrl(url);
-  },
-
-  build(wizardJson) {
-    if (!wizardJson) {
-      return null;
-    }
-
-    if (!wizardJson.completed && wizardJson.steps) {
-      wizardJson.steps = wizardJson.steps
-        .map((step) => {
-          const stepObj = CustomWizardStep.create(step);
-          stepObj.wizardId = wizardJson.id;
-
-          stepObj.fields.sort((a, b) => {
-            return parseFloat(a.number) - parseFloat(b.number);
-          });
-
-          let tabindex = 1;
-          stepObj.fields.forEach((f) => {
-            f.tabindex = tabindex;
-
-            if (["date_time"].includes(f.type)) {
-              tabindex = tabindex + 2;
-            } else {
-              tabindex++;
-            }
-          });
-
-          stepObj.fields = stepObj.fields.map((f) => {
-            f.wizardId = wizardJson.id;
-            f.stepId = stepObj.id;
-            return CustomWizardField.create(f);
-          });
-
-          return stepObj;
-        })
-        .sort((a, b) => {
-          return parseFloat(a.index) - parseFloat(b.index);
-        });
-    }
-    return CustomWizard.create(wizardJson);
+  create(wizardJson = {}) {
+    const wizard = this._super.apply(this);
+    wizard.setProperties(buildProperties(wizardJson));
+    return wizard;
   },
 });
 
-export function findCustomWizard(wizardId, params = {}) {
-  let url = `/w/${wizardId}.json`;
-
-  let paramKeys = Object.keys(params).filter((k) => {
-    if (k === "wizard_id") {
-      return false;
-    }
-    return !!params[k];
-  });
-
-  if (paramKeys.length) {
-    url += "?";
-    paramKeys.forEach((k, i) => {
-      if (i > 0) {
-        url += "&";
-      }
-      url += `${k}=${params[k]}`;
-    });
-  }
-
-  return ajax(url).then((result) => {
-    return CustomWizard.build(result);
-  });
-}
-
-let _wizard_store;
-
-export function updateCachedWizard(wizard) {
-  _wizard_store = wizard;
-}
-
-export function getCachedWizard() {
-  return _wizard_store;
-}
-
 export default CustomWizard;

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

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

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

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

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

@@ -8,10 +8,7 @@ export default DiscourseRoute.extend({
   },
 
   setupController(controller, model) {
-    const customFields = A(model.custom_fields || []);
-
-    controller.setProperties({
-      customFields,
-    });
+    const customFields = A(model || []);
+    controller.set("customFields", customFields);
   },
 });

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

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

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

@@ -1,27 +1,12 @@
+import CustomWizardLogs from "../models/custom-wizard-logs";
 import DiscourseRoute from "discourse/routes/discourse";
-import { ajax } from "discourse/lib/ajax";
-import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
-  router: service(),
-
   model() {
-    return ajax(`/admin/wizards/wizard`);
+    return CustomWizardLogs.list();
   },
 
   setupController(controller, model) {
-    const showParams = this.paramsFor("adminWizardsLogsShow");
-
-    controller.setProperties({
-      wizardId: showParams.wizardId,
-      wizardList: model.wizard_list,
-    });
-  },
-
-  actions: {
-    changeWizard(wizardId) {
-      this.controllerFor("adminWizardsLogs").set("wizardId", wizardId);
-      this.router.transitionTo("adminWizardsLogsShow", wizardId);
-    },
+    controller.set("logs", model);
   },
 });

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

@@ -1,9 +1,9 @@
-import CustomWizardAdmin from "../models/custom-wizard-admin";
+import CustomWizard from "../models/custom-wizard";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
   model() {
-    return CustomWizardAdmin.all();
+    return CustomWizard.all();
   },
 
   setupController(controller, model) {

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

@@ -1,30 +1,42 @@
-import { A } from "@ember/array";
-import CustomWizardAdmin from "../models/custom-wizard-admin";
+import CustomWizard from "../models/custom-wizard";
 import DiscourseRoute from "discourse/routes/discourse";
-import { formatModel } from "../lib/wizard-submission";
-import { inject as service } from "@ember/service";
+
+const excludedMetaFields = ["route_to", "redirect_on_complete", "redirect_to"];
 
 export default DiscourseRoute.extend({
-  router: service(),
-
   model(params) {
-    return CustomWizardAdmin.submissions(params.wizardId);
-  },
-
-  afterModel(model) {
-    if (model === null) {
-      return this.router.transitionTo("adminWizardsSubmissions");
-    }
+    return CustomWizard.submissions(params.wizardId);
   },
 
   setupController(controller, model) {
-    const { fields, submissions } = formatModel(model);
+    if (model && model.submissions) {
+      let fields = ["username"];
+      model.submissions.forEach((s) => {
+        Object.keys(s.fields).forEach((k) => {
+          if (!excludedMetaFields.includes(k) && fields.indexOf(k) < 0) {
+            fields.push(k);
+          }
+        });
+      });
 
-    controller.setProperties({
-      wizard: model.wizard,
-      fields: A(fields),
-      submissions: A(submissions),
-      total: model.total,
-    });
+      let submissions = [];
+      model.submissions.forEach((s) => {
+        let submission = {
+          username: s.username,
+        };
+        Object.keys(s.fields).forEach((f) => {
+          if (fields.includes(f)) {
+            submission[f] = s.fields[f];
+          }
+        });
+        submissions.push(submission);
+      });
+
+      controller.setProperties({
+        wizard: model.wizard,
+        submissions,
+        fields,
+      });
+    }
   },
 });

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

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

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

@@ -1,12 +1,9 @@
-import CustomWizardAdmin from "../models/custom-wizard-admin";
+import CustomWizard from "../models/custom-wizard";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
-import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
-  router: service(),
-
   model(params) {
     if (params.wizardId === "create") {
       return { create: true };
@@ -17,15 +14,13 @@ export default DiscourseRoute.extend({
 
   afterModel(model) {
     if (model.none) {
-      return this.router.transitionTo("adminWizardsWizard");
+      return this.transitionTo("adminWizardsWizard");
     }
   },
 
   setupController(controller, model) {
     const parentModel = this.modelFor("adminWizardsWizard");
-    const wizard = CustomWizardAdmin.create(
-      !model || model.create ? {} : model
-    );
+    const wizard = CustomWizard.create(!model || model.create ? {} : model);
     const fieldTypes = Object.keys(parentModel.field_types).map((type) => {
       return {
         id: type,

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

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

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

@@ -1,26 +1,9 @@
 import DiscourseRoute from "discourse/routes/discourse";
-import { ajax } from "discourse/lib/ajax";
-import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
-  router: service(),
-
-  model() {
-    return ajax("/admin/wizards");
-  },
-
-  setupController(controller, model) {
-    controller.setProperties({
-      subscribed: model.subscribed,
-      subscriptionType: model.subscription_type,
-      subscriptionAttributes: model.subscription_attributes,
-      subscriptionClientInstalled: model.subscription_client_installed,
-    });
-  },
-
-  afterModel(model, transition) {
+  beforeModel(transition) {
     if (transition.targetName === "adminWizards.index") {
-      this.router.transitionTo("adminWizardsWizard");
+      this.transitionTo("adminWizardsWizard");
     }
   },
 });

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

@@ -8,12 +8,7 @@
       {{/if}}
     {{/if}}
 
-    {{d-button
-      label="admin.wizard.api.save"
-      action=(action "save")
-      class="btn-primary"
-      disabled=saveDisabled
-    }}
+    {{d-button label="admin.wizard.api.save" action=(action "save") class="btn-primary" disabled=saveDisabled}}
 
     {{#if showRemove}}
       {{d-button action=(action "remove") label="admin.wizard.api.remove"}}
@@ -26,32 +21,26 @@
     {{/if}}
   </div>
 
-  <div class="wizard-header large">
+  <div class="wizard-header">
     {{#if api.isNew}}
       {{i18n "admin.wizard.api.new"}}
     {{else}}
-      <span>{{api.title}}</span>
+      {{api.title}}
     {{/if}}
   </div>
 
   <div class="metadata">
     <div class="title">
       <label>{{i18n "admin.wizard.api.title"}}</label>
-      <Input
-        @value={{this.api.title}}
-        placeholder={{i18n "admin.wizard.api.title_placeholder"}}
-      />
+      {{input value=api.title placeholder=(i18n "admin.wizard.api.title_placeholder")}}
     </div>
 
-    <div class="name {{nameClass}}">
+    <div class="name">
       <label>{{i18n "admin.wizard.api.name"}}</label>
       {{#if api.isNew}}
-        <Input
-          @value={{this.api.name}}
-          placeholder={{i18n "admin.wizard.api.name_placeholder"}}
-        />
+        {{input value=api.name placeholder=(i18n "admin.wizard.api.name_placeholder")}}
       {{else}}
-        <span>{{api.name}}</span>
+        {{api.name}}
       {{/if}}
     </div>
   </div>
@@ -67,16 +56,14 @@
           <span>{{authErrorMessage}}</span>
         {{/if}}
       {{/if}}
-      {{d-button
-        label="admin.wizard.api.auth.btn"
-        action=(action "authorize")
-        disabled=authDisabled
-        class="btn-primary"
-      }}
+      {{d-button label="admin.wizard.api.auth.btn"
+                 action=(action "authorize")
+                 disabled=authDisabled
+                 class="btn-primary"}}
     {{/if}}
   </div>
 
-  <div class="wizard-header medium">
+  <div class="wizard-header">
     {{i18n "admin.wizard.api.auth.label"}}
   </div>
 </div>
@@ -84,7 +71,7 @@
 <div class="wizard-api-authentication">
   <div class="settings">
 
-    <div class="wizard-header small">
+    <div class="wizard-header medium">
       {{i18n "admin.wizard.api.auth.settings"}}
     </div>
 
@@ -106,8 +93,9 @@
           value=api.authType
           content=authorizationTypes
           onChange=(action (mut api.authType))
-          options=(hash none="admin.wizard.api.auth.type_none")
-        }}
+          options=(hash
+            none="admin.wizard.api.auth.type_none"
+          )}}
       </div>
     </div>
 
@@ -116,7 +104,7 @@
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.auth.url"}}</label>
           <div class="controls">
-            <Input @value={{this.api.authUrl}} />
+            {{input value=api.authUrl}}
           </div>
         </div>
       {{/if}}
@@ -124,21 +112,21 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.token_url"}}</label>
         <div class="controls">
-          <Input @value={{this.api.tokenUrl}} />
+          {{input value=api.tokenUrl}}
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_id"}}</label>
         <div class="controls">
-          <Input @value={{this.api.clientId}} />
+          {{input value=api.clientId}}
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_secret"}}</label>
         <div class="controls">
-          <Input @value={{this.api.clientSecret}} />
+          {{input value=api.clientSecret}}
         </div>
       </div>
 
@@ -147,26 +135,12 @@
         <div class="controls">
           {{#each api.authParams as |param|}}
             <div class="param">
-              <Input
-                @value={{this.param.key}}
-                placeholder={{i18n "admin.wizard.key"}}
-              />
-              <Input
-                @value={{this.param.value}}
-                placeholder={{i18n "admin.wizard.value"}}
-              />
-              {{d-button
-                action=(action "removeParam")
-                actionParam=param
-                icon="times"
-              }}
+              {{input value=param.key placeholder=(i18n "admin.wizard.key")}}
+              {{input value=param.value placeholder=(i18n "admin.wizard.value")}}
+              {{d-button action=(action "removeParam") actionParam=param icon="times"}}
             </div>
           {{/each}}
-          {{d-button
-            label="admin.wizard.api.auth.params.new"
-            icon="plus"
-            action=(action "addParam")
-          }}
+          {{d-button label="admin.wizard.api.auth.params.new" icon="plus" action=(action "addParam")}}
         </div>
       </div>
     {{/if}}
@@ -175,14 +149,14 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.username"}}</label>
         <div class="controls">
-          <Input @value={{this.api.username}} />
+          {{input value=api.username}}
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.password"}}</label>
         <div class="controls">
-          <Input @value={{this.api.password}} />
+          {{input value=api.password}}
         </div>
       </div>
     {{/if}}
@@ -200,7 +174,7 @@
         {{/if}}
       </div>
 
-      <div class="wizard-header small">
+      <div class="wizard-header medium">
         {{i18n "admin.wizard.api.status.label"}}
       </div>
 
@@ -246,16 +220,12 @@
   {{/if}}
 </div>
 
-<div class="wizard-header medium">
+<div class="wizard-header">
   {{i18n "admin.wizard.api.endpoint.label"}}
 </div>
 
 <div class="wizard-api-endpoints">
-  {{d-button
-    action=(action "addEndpoint")
-    label="admin.wizard.api.endpoint.add"
-    icon="plus"
-  }}
+  {{d-button action=(action "addEndpoint") label="admin.wizard.api.endpoint.add" icon="plus"}}
 
   {{#if api.endpoints}}
     <div class="endpoint-list">
@@ -265,43 +235,38 @@
             <div class="endpoint">
               <div class="endpoint-">
                 <div class="top">
-                  <Input
-                    @value={{endpoint.name}}
-                    placeholder={{i18n "admin.wizard.api.endpoint.name"}}
-                  />
-                  <Input
-                    @value={{endpoint.url}}
-                    placeholder={{i18n "admin.wizard.api.endpoint.url"}}
-                    class="endpoint-url"
-                  />
-                  {{d-button
-                    action=(action "removeEndpoint")
-                    actionParam=endpoint
-                    icon="times"
-                    class="remove-endpoint"
-                  }}
+                  {{input value=endpoint.name
+                          placeholder=(i18n "admin.wizard.api.endpoint.name")}}
+                  {{input value=endpoint.url
+                          placeholder=(i18n "admin.wizard.api.endpoint.url")
+                          class="endpoint-url"}}
+                  {{d-button action=(action "removeEndpoint")
+                             actionParam=endpoint
+                             icon="times"
+                             class="remove-endpoint"}}
                 </div>
                 <div class="bottom">
                   {{combo-box
                     content=endpointMethods
                     value=endpoint.method
                     onChange=(action (mut endpoint.method))
-                    options=(hash none="admin.wizard.api.endpoint.method")
-                  }}
+                    options=(hash
+                      none="admin.wizard.api.endpoint.method"
+                    )}}
                   {{combo-box
                     content=contentTypes
                     value=endpoint.content_type
                     onChange=(action (mut endpoint.content_type))
-                    options=(hash none="admin.wizard.api.endpoint.content_type")
-                  }}
+                    options=(hash
+                      none="admin.wizard.api.endpoint.content_type"
+                    )}}
                   {{multi-select
                     value=endpoint.success_codes
                     content=successCodes
                     onChange=(action (mut endpoint.success_codes))
                     options=(hash
                       none="admin.wizard.api.endpoint.success_codes"
-                    )
-                  }}
+                    )}}
                 </div>
               </div>
             </div>
@@ -312,16 +277,11 @@
   {{/if}}
 </div>
 
-<div class="wizard-header medium">
+<div class="wizard-header">
   {{i18n "admin.wizard.api.log.label"}}
-
-  <div class="controls">
-    {{d-button
-      action=(action "clearLogs")
-      class="clear-logs"
-      label="admin.wizard.api.log.clear"
-    }}
-  </div>
+  {{d-button action=(action "clearLogs")
+             icon="trash-alt"
+             class="clear-logs"}}
 </div>
 
 <div class="wizard-api-log">
@@ -340,10 +300,7 @@
             <td>{{logentry.time}}</td>
             <td class="user-image">
               <div class="user-image-inner">
-                <a
-                  href={{logentry.userpath}}
-                  data-user-card={{logentry.username}}
-                >{{avatar logentry imageSize="medium"}}</a>
+                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="large"}}</a>
               </div>
             </td>
             <td>{{logentry.status}}</td>
@@ -354,4 +311,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>