From dadac11c1e8ac5c66c64709346ae1c4d6ea2e84f Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Wed, 7 Apr 2021 10:49:48 +0530
Subject: [PATCH 01/17] FIX: use wizard-i18n helper to support theme
 translation overrides (#88)

---
 .../wizard/templates/components/similar-topics-validator.hbs  | 4 ++--
 assets/javascripts/wizard/templates/components/validator.hbs  | 4 ++--
 .../wizard/templates/components/wizard-similar-topics.hbs     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/javascripts/wizard/templates/components/similar-topics-validator.hbs b/assets/javascripts/wizard/templates/components/similar-topics-validator.hbs
index 32727326..2e92333d 100644
--- a/assets/javascripts/wizard/templates/components/similar-topics-validator.hbs
+++ b/assets/javascripts/wizard/templates/components/similar-topics-validator.hbs
@@ -1,9 +1,9 @@
 <label class={{currentStateClass}}>
   {{#if currentState}}
     {{#if insufficientCharactersCategories}}
-      {{html-safe (i18n currentStateKey catLinks=catLinks)}}
+      {{html-safe (wizard-i18n currentStateKey catLinks=catLinks)}}
     {{else}}
-      {{i18n currentStateKey}}
+      {{wizard-i18n currentStateKey}}
     {{/if}}
   {{/if}}
 </label>
diff --git a/assets/javascripts/wizard/templates/components/validator.hbs b/assets/javascripts/wizard/templates/components/validator.hbs
index 09a4c262..88ffa227 100644
--- a/assets/javascripts/wizard/templates/components/validator.hbs
+++ b/assets/javascripts/wizard/templates/components/validator.hbs
@@ -1,5 +1,5 @@
 {{#if isValid}}
-  {{i18n validMessageKey}}
+  {{wizard-i18n validMessageKey}}
 {{else}}  
-  {{i18n invalidMessageKey}}
+  {{wizard-i18n invalidMessageKey}}
 {{/if}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
index 045f973d..7eed935f 100644
--- a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
@@ -6,6 +6,6 @@
   </ul>
 {{else}}
   <a class="show-topics" {{action "toggleShowTopics"}}>
-    {{i18n 'realtime_validations.similar_topics.show'}}
+    {{wizard-i18n 'realtime_validations.similar_topics.show'}}
   </a>
 {{/if}}
\ No newline at end of file

From 105fc4677435be9456dcdf610b4059ae2ef9d1ae Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Fri, 9 Apr 2021 11:04:42 +0530
Subject: [PATCH 02/17] FEATURE: added liquid based templating (#83)

* FEATURE: added liquid based templating

* templating should be false by default

* added rspec tests for mapper templating

* wrapped templating tests in a context block

* added a custom liquid filter and tests

* ran rubocop on changed files

* DEV: minor variable and naming changes

* minor code formatting

* improved overall structure and tightened spec for custom filter

* added a spec template: false

* define method at the top of spec file

* naming convention

* removed extra space
---
 .../liquid_extensions/first_non_empty.rb      |  11 ++
 lib/custom_wizard/mapper.rb                   |   7 +-
 plugin.rb                                     |   4 +
 spec/components/custom_wizard/mapper_spec.rb  | 159 +++++++++++++++++-
 4 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 lib/custom_wizard/liquid_extensions/first_non_empty.rb

diff --git a/lib/custom_wizard/liquid_extensions/first_non_empty.rb b/lib/custom_wizard/liquid_extensions/first_non_empty.rb
new file mode 100644
index 00000000..bd4dec01
--- /dev/null
+++ b/lib/custom_wizard/liquid_extensions/first_non_empty.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ::CustomWizard
+  module LiquidFilter
+    module FirstNonEmpty
+      def first_non_empty(*multiple)
+        multiple.find { |var| var.present? }
+      end
+    end
+  end
+end
diff --git a/lib/custom_wizard/mapper.rb b/lib/custom_wizard/mapper.rb
index df49c538..c1187b0f 100644
--- a/lib/custom_wizard/mapper.rb
+++ b/lib/custom_wizard/mapper.rb
@@ -213,7 +213,7 @@ class CustomWizard::Mapper
     end
   end
 
-  def interpolate(string, opts = { user: true, wizard: true, value: true })
+  def interpolate(string, opts = { user: true, wizard: true, value: true, template: false })
     return string if string.blank?
 
     if opts[:user]
@@ -248,6 +248,11 @@ class CustomWizard::Mapper
       end
     end
 
+    if opts[:template]
+      template = Liquid::Template.parse(string)
+      string = template.render(data)
+    end
+
     string
   end
 
diff --git a/plugin.rb b/plugin.rb
index 0a272aed..169f6ff6 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -6,6 +6,7 @@
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact emails: angus@thepavilion.io
 
+gem 'liquid', '5.0.1', require: true
 register_asset 'stylesheets/common/wizard-admin.scss'
 register_asset 'stylesheets/common/wizard-mapper.scss'
 register_asset 'lib/jquery.timepicker.min.js'
@@ -73,6 +74,7 @@ after_initialize do
     ../lib/custom_wizard/api/authorization.rb
     ../lib/custom_wizard/api/endpoint.rb
     ../lib/custom_wizard/api/log_entry.rb
+    ../lib/custom_wizard/liquid_extensions/first_non_empty.rb
     ../serializers/custom_wizard/api/authorization_serializer.rb
     ../serializers/custom_wizard/api/basic_endpoint_serializer.rb
     ../serializers/custom_wizard/api/endpoint_serializer.rb
@@ -97,6 +99,8 @@ after_initialize do
     load File.expand_path(path, __FILE__)
   end
 
+  Liquid::Template.register_filter(::CustomWizard::LiquidFilter::FirstNonEmpty)
+
   add_class_method(:wizard, :user_requires_completion?) do |user|
     wizard_result = self.new(user).requires_completion?
     return wizard_result if wizard_result
diff --git a/spec/components/custom_wizard/mapper_spec.rb b/spec/components/custom_wizard/mapper_spec.rb
index 3b993b4b..aa34f9f1 100644
--- a/spec/components/custom_wizard/mapper_spec.rb
+++ b/spec/components/custom_wizard/mapper_spec.rb
@@ -41,6 +41,39 @@ describe CustomWizard::Mapper do
       "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/mapper/data.json"
     ).read)
   }
+  let(:template_params) {
+    {
+      "step_1_field_1" => "Hello"
+    }
+  }
+  let(:template_params_empty) {
+    {
+      "step_1_field_1" => nil,
+      "step_1_field_2" => nil,
+      "step_1_field_3" => ""
+    }
+  }
+  let(:template_params_non_empty) {
+    {
+      "step_1_field_1" => nil,
+      "step_1_field_2" => "",
+      "step_1_field_3" => "Value"
+    }
+  }
+  let(:template_params_multiple_non_empty) {
+    {
+      "step_1_field_1" => nil,
+      "step_1_field_2" => "Value1",
+      "step_1_field_3" => "Value"
+    }
+  }
+
+  def create_template_mapper(data, user)
+    CustomWizard::Mapper.new(
+      data: data,
+      user: user
+    )
+  end
 
   it "maps values" do
     expect(CustomWizard::Mapper.new(
@@ -88,7 +121,7 @@ describe CustomWizard::Mapper do
     it "does not map when one of multiple conditions are not met" do
       user1.email = "angus@other-email.com"
       user1.save
-      
+
       expect(CustomWizard::Mapper.new(
         inputs: inputs['conditional_multiple_pairs'],
         data: data,
@@ -250,4 +283,128 @@ describe CustomWizard::Mapper do
       user: user1
     ).perform).to eq(false)
   end
+
+  context "output templating" do
+    it "passes the correct values to the template" do
+      template = "w{step_1_field_1}"
+      mapper = create_template_mapper(template_params, user1)
+      result = mapper.interpolate(
+        template.dup,
+        template: true,
+        user: true,
+        wizard: true,
+        value: true
+      )
+      expect(result).to eq(template_params["step_1_field_1"])
+    end
+
+    it "treats replaced values as string literals" do
+      template = '{{ "w{step_1_field_1}" | size }}'
+      mapper = create_template_mapper(template_params, user1)
+      result = mapper.interpolate(
+        template.dup,
+        template: true,
+        user: true,
+        wizard: true,
+        value: true
+      )
+      expect(result).to eq(template_params["step_1_field_1"].size.to_s)
+    end
+
+    it "allows the wizard values to be used inside conditionals" do
+      template = <<-LIQUID
+        {%- if "w{step_1_field_1}" contains "ello" -%}
+          Correct
+        {%- else -%}
+          Incorrect
+        {%-endif-%}
+      LIQUID
+      mapper = create_template_mapper(template_params, user1)
+      result = mapper.interpolate(
+        template.dup,
+        template: true,
+        user: true,
+        wizard: true,
+        value: true
+      )
+      expect(result).to eq("Correct")
+    end
+
+    it "can access data passed to render method as variable" do
+      template = "{{step_1_field_1.size}}"
+      mapper = create_template_mapper(template_params, user1)
+      result = mapper.interpolate(
+        template.dup,
+        template: true,
+        user: true,
+        wizard: true,
+        value: true
+      )
+      expect(result).to eq(template_params["step_1_field_1"].size.to_s)
+    end
+
+    it "doesn't parse the template when template param is false" do
+      template = <<-LIQUID.strip
+        {{ "w{step_1_field_1}" | size}}
+      LIQUID
+      mapper = create_template_mapper(template_params, user1)
+      result = mapper.interpolate(
+        template.dup,
+        template: false,
+      )
+      expect(result).to eq(template)
+    end
+
+    context "custom filter: 'first_non_empty'" do
+      it "gives first non empty element from list" do
+        template = <<-LIQUID.strip
+          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
+          {{ entry }}
+        LIQUID
+        mapper = create_template_mapper(template_params_non_empty, user1)
+        result = mapper.interpolate(
+          template.dup,
+          template: true,
+          user: true,
+          wizard: true,
+          value: true
+        )
+        expect(result).to eq(template_params_non_empty["step_1_field_3"])
+      end
+
+      it "gives first non empty element from list when multiple non empty values present" do
+        template = <<-LIQUID.strip
+          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
+          {{ entry }}
+        LIQUID
+        mapper = create_template_mapper(template_params_multiple_non_empty, user1)
+        result = mapper.interpolate(
+          template.dup,
+          template: true,
+          user: true,
+          wizard: true,
+          value: true
+        )
+        expect(result).to eq(template_params_multiple_non_empty["step_1_field_2"])
+      end
+
+      it "gives empty if all elements are empty" do
+        template = <<-LIQUID.strip
+          {%- assign entry = "" | first_non_empty: step_1_field_1, step_1_field_2, step_1_field_3 -%}
+          {%- if entry -%}
+            {{ entry }}
+          {%- endif -%}
+        LIQUID
+        mapper = create_template_mapper(template_params_empty, user1)
+        result = mapper.interpolate(
+          template.dup,
+          template: true,
+          user: true,
+          wizard: true,
+          value: true
+        )
+        expect(result).to eq("")
+      end
+    end
+  end
 end

From 9289439cbd81386741ae05355f8d75262a5a6ef5 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 12 Apr 2021 10:19:37 +0530
Subject: [PATCH 03/17] added gems folder to gitignore (#90)

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9c1559ac..98902d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 coverage/*
-!coverage/.last_run.json
\ No newline at end of file
+!coverage/.last_run.json
+gems/

From 88a084684277328657c5738743406ce72cf40c97 Mon Sep 17 00:00:00 2001
From: angusmcleod <angus@mcleod.org.au>
Date: Mon, 12 Apr 2021 14:56:48 +1000
Subject: [PATCH 04/17] Remove jquery timepicker

---
 assets/lib/jquery.timepicker.min.js |  7 ---
 assets/lib/jquery.timepicker.scss   | 72 -----------------------------
 plugin.rb                           |  2 -
 3 files changed, 81 deletions(-)
 delete mode 100644 assets/lib/jquery.timepicker.min.js
 delete mode 100644 assets/lib/jquery.timepicker.scss

diff --git a/assets/lib/jquery.timepicker.min.js b/assets/lib/jquery.timepicker.min.js
deleted file mode 100644
index 6a7b5954..00000000
--- a/assets/lib/jquery.timepicker.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * jquery-timepicker v1.11.11 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
- * Copyright (c) 2017 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
- * License: MIT
- */
-
-!function(a){"object"==typeof exports&&exports&&"object"==typeof module&&module&&module.exports===exports?a(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(a){var b=a[0];return b.offsetWidth>0&&b.offsetHeight>0}function c(b){if(b.minTime&&(b.minTime=t(b.minTime)),b.maxTime&&(b.maxTime=t(b.maxTime)),b.durationTime&&"function"!=typeof b.durationTime&&(b.durationTime=t(b.durationTime)),"now"==b.scrollDefault)b.scrollDefault=function(){return b.roundingFunction(t(new Date),b)};else if(b.scrollDefault&&"function"!=typeof b.scrollDefault){var c=b.scrollDefault;b.scrollDefault=function(){return b.roundingFunction(t(c),b)}}else b.minTime&&(b.scrollDefault=function(){return b.roundingFunction(b.minTime,b)});if("string"===a.type(b.timeFormat)&&b.timeFormat.match(/[gh]/)&&(b._twelveHourTime=!0),b.showOnFocus===!1&&-1!=b.showOn.indexOf("focus")&&b.showOn.splice(b.showOn.indexOf("focus"),1),b.disableTimeRanges.length>0){for(var d in b.disableTimeRanges)b.disableTimeRanges[d]=[t(b.disableTimeRanges[d][0]),t(b.disableTimeRanges[d][1])];b.disableTimeRanges=b.disableTimeRanges.sort(function(a,b){return a[0]-b[0]});for(var d=b.disableTimeRanges.length-1;d>0;d--)b.disableTimeRanges[d][0]<=b.disableTimeRanges[d-1][1]&&(b.disableTimeRanges[d-1]=[Math.min(b.disableTimeRanges[d][0],b.disableTimeRanges[d-1][0]),Math.max(b.disableTimeRanges[d][1],b.disableTimeRanges[d-1][1])],b.disableTimeRanges.splice(d,1))}return b}function d(b){var c=b.data("timepicker-settings"),d=b.data("timepicker-list");if(d&&d.length&&(d.remove(),b.data("timepicker-list",!1)),c.useSelect){d=a("<select />",{"class":"ui-timepicker-select"});var g=d}else{d=a("<ul />",{"class":"ui-timepicker-list"});var g=a("<div />",{"class":"ui-timepicker-wrapper",tabindex:-1});g.css({display:"none",position:"absolute"}).append(d)}if(c.noneOption)if(c.noneOption===!0&&(c.noneOption=c.useSelect?"Time...":"None"),a.isArray(c.noneOption)){for(var i in c.noneOption)if(parseInt(i,10)==i){var k=e(c.noneOption[i],c.useSelect);d.append(k)}}else{var k=e(c.noneOption,c.useSelect);d.append(k)}if(c.className&&g.addClass(c.className),(null!==c.minTime||null!==c.durationTime)&&c.showDuration){"function"==typeof c.step?"function":c.step;g.addClass("ui-timepicker-with-duration"),g.addClass("ui-timepicker-step-"+c.step)}var l=c.minTime;"function"==typeof c.durationTime?l=t(c.durationTime()):null!==c.durationTime&&(l=c.durationTime);var n=null!==c.minTime?c.minTime:0,o=null!==c.maxTime?c.maxTime:n+v-1;n>o&&(o+=v),o===v-1&&"string"===a.type(c.timeFormat)&&c.show2400&&(o=v);var p=c.disableTimeRanges,w=0,x=p.length,z=c.step;"function"!=typeof z&&(z=function(){return c.step});for(var i=n,A=0;o>=i;A++,i+=60*z(A)){var B=i,C=s(B,c);if(c.useSelect){var D=a("<option />",{value:C});D.text(C)}else{var D=a("<li />");D.addClass(v/2>B%v?"ui-timepicker-am":"ui-timepicker-pm"),D.data("time",u(B,c)),D.text(C)}if((null!==c.minTime||null!==c.durationTime)&&c.showDuration){var E=r(i-l,c.step);if(c.useSelect)D.text(D.text()+" ("+E+")");else{var F=a("<span />",{"class":"ui-timepicker-duration"});F.text(" ("+E+")"),D.append(F)}}x>w&&(B>=p[w][1]&&(w+=1),p[w]&&B>=p[w][0]&&B<p[w][1]&&(c.useSelect?D.prop("disabled",!0):D.addClass("ui-timepicker-disabled"))),d.append(D)}if(g.data("timepicker-input",b),b.data("timepicker-list",g),c.useSelect)b.val()&&d.val(f(t(b.val()),c)),d.on("focus",function(){a(this).data("timepicker-input").trigger("showTimepicker")}),d.on("blur",function(){a(this).data("timepicker-input").trigger("hideTimepicker")}),d.on("change",function(){m(b,a(this).val(),"select")}),m(b,d.val(),"initial"),b.hide().after(d);else{var G=c.appendTo;"string"==typeof G?G=a(G):"function"==typeof G&&(G=G(b)),G.append(g),j(b,d),d.on("mousedown click","li",function(c){b.off("focus.timepicker"),b.on("focus.timepicker-ie-hack",function(){b.off("focus.timepicker-ie-hack"),b.on("focus.timepicker",y.show)}),h(b)||b[0].focus(),d.find("li").removeClass("ui-timepicker-selected"),a(this).addClass("ui-timepicker-selected"),q(b)&&(b.trigger("hideTimepicker"),d.on("mouseup.timepicker click.timepicker","li",function(a){d.off("mouseup.timepicker click.timepicker"),g.hide()}))})}}function e(b,c){var d,e,f;return"object"==typeof b?(d=b.label,e=b.className,f=b.value):"string"==typeof b?d=b:a.error("Invalid noneOption value"),c?a("<option />",{value:f,"class":e,text:d}):a("<li />",{"class":e,text:d}).data("time",String(f))}function f(a,b){return a=b.roundingFunction(a,b),null!==a?s(a,b):void 0}function g(b){if(b.target!=window){var c=a(b.target);c.closest(".ui-timepicker-input").length||c.closest(".ui-timepicker-wrapper").length||(y.hide(),a(document).unbind(".ui-timepicker"),a(window).unbind(".ui-timepicker"))}}function h(a){var b=a.data("timepicker-settings");return(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&b.disableTouchKeyboard}function i(b,c,d){if(!d&&0!==d)return!1;var e=b.data("timepicker-settings"),f=!1,d=e.roundingFunction(d,e);return c.find("li").each(function(b,c){var e=a(c);if("number"==typeof e.data("time"))return e.data("time")==d?(f=e,!1):void 0}),f}function j(a,b){b.find("li").removeClass("ui-timepicker-selected");var c=a.data("timepicker-settings"),d=t(l(a),c);if(null!==d){var e=i(a,b,d);if(e){var f=e.offset().top-b.offset().top;(f+e.outerHeight()>b.outerHeight()||0>f)&&b.scrollTop(b.scrollTop()+e.position().top-e.outerHeight()),(c.forceRoundTime||e.data("time")===d)&&e.addClass("ui-timepicker-selected")}}}function k(b,c){if("timepicker"!=c){var d=a(this);if(""===this.value)return void m(d,null,c);if(!d.is(":focus")||b&&"change"==b.type){var e=d.data("timepicker-settings"),f=t(this.value,e);if(null===f)return void d.trigger("timeFormatError");var g=!1;if(null!==e.minTime&&null!==e.maxTime&&(f<e.minTime||f>e.maxTime)&&(g=!0),a.each(e.disableTimeRanges,function(){return f>=this[0]&&f<this[1]?(g=!0,!1):void 0}),e.forceRoundTime){var h=e.roundingFunction(f,e);h!=f&&(f=h,c=null)}var i=s(f,e);g?(m(d,i,"error")||b&&"change"==b.type)&&d.trigger("timeRangeError"):m(d,i,c)}}}function l(a){return a.is("input")?a.val():a.data("ui-timepicker-value")}function m(a,b,c){if(a.is("input")){a.val(b);var d=a.data("timepicker-settings");d.useSelect&&"select"!=c&&"initial"!=c&&a.data("timepicker-list").val(f(t(b),d))}return a.data("ui-timepicker-value")!=b?(a.data("ui-timepicker-value",b),"select"==c?a.trigger("selectTime").trigger("changeTime").trigger("change","timepicker"):-1==["error","initial"].indexOf(c)&&a.trigger("changeTime"),!0):(a.trigger("selectTime"),!1)}function n(a){switch(a.keyCode){case 13:case 9:return;default:a.preventDefault()}}function o(c){var d=a(this),e=d.data("timepicker-list");if(!e||!b(e)){if(40!=c.keyCode)return!0;y.show.call(d.get(0)),e=d.data("timepicker-list"),h(d)||d.focus()}switch(c.keyCode){case 13:return q(d)&&(k.call(d.get(0),{type:"change"}),y.hide.apply(this)),c.preventDefault(),!1;case 38:var f=e.find(".ui-timepicker-selected");return f.length?f.is(":first-child")||(f.removeClass("ui-timepicker-selected"),f.prev().addClass("ui-timepicker-selected"),f.prev().position().top<f.outerHeight()&&e.scrollTop(e.scrollTop()-f.outerHeight())):(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")),!1;case 40:return f=e.find(".ui-timepicker-selected"),0===f.length?(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")):f.is(":last-child")||(f.removeClass("ui-timepicker-selected"),f.next().addClass("ui-timepicker-selected"),f.next().position().top+2*f.outerHeight()>e.outerHeight()&&e.scrollTop(e.scrollTop()+f.outerHeight())),!1;case 27:e.find("li").removeClass("ui-timepicker-selected"),y.hide();break;case 9:y.hide();break;default:return!0}}function p(c){var d=a(this),e=d.data("timepicker-list"),f=d.data("timepicker-settings");if(!e||!b(e)||f.disableTextInput)return!0;if("paste"===c.type||"cut"===c.type)return void setTimeout(function(){f.typeaheadHighlight?j(d,e):e.hide()},0);switch(c.keyCode){case 96:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:case 65:case 77:case 80:case 186:case 8:case 46:f.typeaheadHighlight?j(d,e):e.hide()}}function q(a){var b=a.data("timepicker-settings"),c=a.data("timepicker-list"),d=null,e=c.find(".ui-timepicker-selected");return e.hasClass("ui-timepicker-disabled")?!1:(e.length&&(d=e.data("time")),null!==d&&("string"!=typeof d&&(d=s(d,b)),m(a,d,"select")),!0)}function r(a,b){a=Math.abs(a);var c,d,e=Math.round(a/60),f=[];return 60>e?f=[e,w.mins]:(c=Math.floor(e/60),d=e%60,30==b&&30==d&&(c+=w.decimal+5),f.push(c),f.push(1==c?w.hr:w.hrs),30!=b&&d&&(f.push(d),f.push(w.mins))),f.join(" ")}function s(b,c){if("number"!=typeof b)return null;var d=parseInt(b%60),e=parseInt(b/60%60),f=parseInt(b/3600%24),g=new Date(1970,0,2,f,e,d,0);if(isNaN(g.getTime()))return null;if("function"===a.type(c.timeFormat))return c.timeFormat(g);for(var h,i,j="",k=0;k<c.timeFormat.length;k++)switch(i=c.timeFormat.charAt(k)){case"a":j+=g.getHours()>11?w.pm:w.am;break;case"A":j+=g.getHours()>11?w.PM:w.AM;break;case"g":h=g.getHours()%12,j+=0===h?"12":h;break;case"G":h=g.getHours(),b===v&&(h=c.show2400?24:0),j+=h;break;case"h":h=g.getHours()%12,0!==h&&10>h&&(h="0"+h),j+=0===h?"12":h;break;case"H":h=g.getHours(),b===v&&(h=c.show2400?24:0),j+=h>9?h:"0"+h;break;case"i":var e=g.getMinutes();j+=e>9?e:"0"+e;break;case"s":d=g.getSeconds(),j+=d>9?d:"0"+d;break;case"\\":k++,j+=c.timeFormat.charAt(k);break;default:j+=i}return j}function t(a,b){if(""===a||null===a)return null;if("object"==typeof a)return 3600*a.getHours()+60*a.getMinutes()+a.getSeconds();if("string"!=typeof a)return a;a=a.toLowerCase().replace(/[\s\.]/g,""),("a"==a.slice(-1)||"p"==a.slice(-1))&&(a+="m");var c="("+w.am.replace(".","")+"|"+w.pm.replace(".","")+"|"+w.AM.replace(".","")+"|"+w.PM.replace(".","")+")?",d=new RegExp("^"+c+"([0-9]?[0-9])\\W?([0-5][0-9])?\\W?([0-5][0-9])?"+c+"$"),e=a.match(d);if(!e)return null;var f=parseInt(1*e[2],10),g=e[1]||e[5],h=f,i=1*e[3]||0,j=1*e[4]||0;if(12>=f&&g){var k=g==w.pm||g==w.PM;h=12==f?k?12:0:f+(k?12:0)}else if(b){var l=3600*f+60*i+j;if(l>=v+(b.show2400?1:0)){if(b.wrapHours===!1)return null;h=f%24}}var m=3600*h+60*i+j;if(12>f&&!g&&b&&b._twelveHourTime&&b.scrollDefault){var n=m-b.scrollDefault();0>n&&n>=v/-2&&(m=(m+v/2)%v)}return m}function u(a,b){return a==v&&b.show2400?a:a%v}var v=86400,w={am:"am",pm:"pm",AM:"AM",PM:"PM",decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},x={appendTo:"body",className:null,closeOnWindowScroll:!1,disableTextInput:!1,disableTimeRanges:[],disableTouchKeyboard:!1,durationTime:null,forceRoundTime:!1,maxTime:null,minTime:null,noneOption:!1,orientation:"l",roundingFunction:function(a,b){if(null===a)return null;if("number"!=typeof b.step)return a;var c=a%(60*b.step),d=b.minTime||0;return c-=d%(60*b.step),c>=30*b.step?a+=60*b.step-c:a-=c,u(a,b)},scrollDefault:null,selectOnBlur:!1,show2400:!1,showDuration:!1,showOn:["click","focus"],showOnFocus:!0,step:30,stopScrollPropagation:!1,timeFormat:"g:ia",typeaheadHighlight:!0,useSelect:!1,wrapHours:!0},y={init:function(b){return this.each(function(){var e=a(this),f=[];for(var g in x)e.data(g)&&(f[g]=e.data(g));var h=a.extend({},x,b,f);if(h.lang&&(w=a.extend(w,h.lang)),h=c(h),e.data("timepicker-settings",h),e.addClass("ui-timepicker-input"),h.useSelect)d(e);else{if(e.prop("autocomplete","off"),h.showOn)for(var i in h.showOn)e.on(h.showOn[i]+".timepicker",y.show);e.on("change.timepicker",k),e.on("keydown.timepicker",o),e.on("keyup.timepicker",p),h.disableTextInput&&e.on("keydown.timepicker",n),e.on("cut.timepicker",p),e.on("paste.timepicker",p),k.call(e.get(0),null,"initial")}})},show:function(c){var e=a(this),f=e.data("timepicker-settings");if(c&&c.preventDefault(),f.useSelect)return void e.data("timepicker-list").focus();h(e)&&e.blur();var k=e.data("timepicker-list");if(!e.prop("readonly")&&(k&&0!==k.length&&"function"!=typeof f.durationTime||(d(e),k=e.data("timepicker-list")),!b(k))){e.data("ui-timepicker-value",e.val()),j(e,k),y.hide(),k.show();var m={};f.orientation.match(/r/)?m.left=e.offset().left+e.outerWidth()-k.outerWidth()+parseInt(k.css("marginLeft").replace("px",""),10):m.left=e.offset().left+parseInt(k.css("marginLeft").replace("px",""),10);var n;n=f.orientation.match(/t/)?"t":f.orientation.match(/b/)?"b":e.offset().top+e.outerHeight(!0)+k.outerHeight()>a(window).height()+a(window).scrollTop()?"t":"b","t"==n?(k.addClass("ui-timepicker-positioned-top"),m.top=e.offset().top-k.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)):(k.removeClass("ui-timepicker-positioned-top"),m.top=e.offset().top+e.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)),k.offset(m);var o=k.find(".ui-timepicker-selected");if(!o.length){var p=t(l(e));null!==p?o=i(e,k,p):f.scrollDefault&&(o=i(e,k,f.scrollDefault()))}if((!o.length||o.hasClass("ui-timepicker-disabled"))&&(o=k.find("li:not(.ui-timepicker-disabled):first")),o&&o.length){var q=k.scrollTop()+o.position().top-o.outerHeight();k.scrollTop(q)}else k.scrollTop(0);return f.stopScrollPropagation&&a(document).on("wheel.ui-timepicker",".ui-timepicker-wrapper",function(b){b.preventDefault();var c=a(this).scrollTop();a(this).scrollTop(c+b.originalEvent.deltaY)}),a(document).on("touchstart.ui-timepicker mousedown.ui-timepicker",g),a(window).on("resize.ui-timepicker",g),f.closeOnWindowScroll&&a(document).on("scroll.ui-timepicker",g),e.trigger("showTimepicker"),this}},hide:function(c){var d=a(this),e=d.data("timepicker-settings");return e&&e.useSelect&&d.blur(),a(".ui-timepicker-wrapper").each(function(){var c=a(this);if(b(c)){var d=c.data("timepicker-input"),e=d.data("timepicker-settings");e&&e.selectOnBlur&&q(d),c.hide(),d.trigger("hideTimepicker")}}),this},option:function(b,e){return"string"==typeof b&&"undefined"==typeof e?a(this).data("timepicker-settings")[b]:this.each(function(){var f=a(this),g=f.data("timepicker-settings"),h=f.data("timepicker-list");"object"==typeof b?g=a.extend(g,b):"string"==typeof b&&(g[b]=e),g=c(g),f.data("timepicker-settings",g),k.call(f.get(0),{type:"change"},"initial"),h&&(h.remove(),f.data("timepicker-list",!1)),g.useSelect&&d(f)})},getSecondsFromMidnight:function(){return t(l(this))},getTime:function(a){var b=this,c=l(b);if(!c)return null;var d=t(c);if(null===d)return null;a||(a=new Date);var e=new Date(a);return e.setHours(d/3600),e.setMinutes(d%3600/60),e.setSeconds(d%60),e.setMilliseconds(0),e},isVisible:function(){var a=this,c=a.data("timepicker-list");return!(!c||!b(c))},setTime:function(a){var b=this,c=b.data("timepicker-settings");if(c.forceRoundTime)var d=f(t(a),c);else var d=s(t(a),c);return a&&null===d&&c.noneOption&&(d=a),b.val(d),k.call(b.get(0),{type:"change"},"initial"),b.data("timepicker-list")&&j(b,b.data("timepicker-list")),this},remove:function(){var a=this;if(a.hasClass("ui-timepicker-input")){var b=a.data("timepicker-settings");return a.removeAttr("autocomplete","off"),a.removeClass("ui-timepicker-input"),a.removeData("timepicker-settings"),a.off(".timepicker"),a.data("timepicker-list")&&a.data("timepicker-list").remove(),b.useSelect&&a.show(),a.removeData("timepicker-list"),this}}};a.fn.timepicker=function(b){return this.length?y[b]?this.hasClass("ui-timepicker-input")?y[b].apply(this,Array.prototype.slice.call(arguments,1)):this:"object"!=typeof b&&b?void a.error("Method "+b+" does not exist on jQuery.timepicker"):y.init.apply(this,arguments):this}});
diff --git a/assets/lib/jquery.timepicker.scss b/assets/lib/jquery.timepicker.scss
deleted file mode 100644
index 950a0b1d..00000000
--- a/assets/lib/jquery.timepicker.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-.ui-timepicker-wrapper {
-	overflow-y: auto;
-	max-height: 150px;
-	width: 6.5em;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	outline: none;
-	z-index: 10001;
-	margin: 0;
-}
-
-.ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 13em;
-}
-
-.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,
-.ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60 {
-	width: 11em;
-}
-
-.ui-timepicker-list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.ui-timepicker-duration {
-	margin-left: 5px; color: #888;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-duration {
-	color: #888;
-}
-
-.ui-timepicker-list li {
-	padding: 3px 0 3px 5px;
-	cursor: pointer;
-	white-space: nowrap;
-	color: #000;
-	list-style: none;
-	margin: 0;
-}
-
-.ui-timepicker-list:hover .ui-timepicker-selected {
-	background: #fff; color: #000;
-}
-
-li.ui-timepicker-selected,
-.ui-timepicker-list li:hover,
-.ui-timepicker-list .ui-timepicker-selected:hover {
-	background: #1980EC; color: #fff;
-}
-
-li.ui-timepicker-selected .ui-timepicker-duration,
-.ui-timepicker-list li:hover .ui-timepicker-duration {
-	color: #ccc;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled,
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	color: #888;
-	cursor: default;
-}
-
-.ui-timepicker-list li.ui-timepicker-disabled:hover,
-.ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	background: #f2f2f2;
-}
diff --git a/plugin.rb b/plugin.rb
index 169f6ff6..56673a13 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -9,8 +9,6 @@
 gem 'liquid', '5.0.1', require: true
 register_asset 'stylesheets/common/wizard-admin.scss'
 register_asset 'stylesheets/common/wizard-mapper.scss'
-register_asset 'lib/jquery.timepicker.min.js'
-register_asset 'lib/jquery.timepicker.scss'
 
 enabled_site_setting :custom_wizard_enabled
 

From 0a23172fa9037904252f35ed8169368faf651d79 Mon Sep 17 00:00:00 2001
From: angusmcleod <angus@mcleod.org.au>
Date: Mon, 12 Apr 2021 15:05:04 +1000
Subject: [PATCH 05/17] Remove jquery timepicker from wizard client

---
 assets/javascripts/wizard/lib/jquery.timepicker.min.js | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 assets/javascripts/wizard/lib/jquery.timepicker.min.js

diff --git a/assets/javascripts/wizard/lib/jquery.timepicker.min.js b/assets/javascripts/wizard/lib/jquery.timepicker.min.js
deleted file mode 100644
index 6a7b5954..00000000
--- a/assets/javascripts/wizard/lib/jquery.timepicker.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * jquery-timepicker v1.11.11 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
- * Copyright (c) 2017 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
- * License: MIT
- */
-
-!function(a){"object"==typeof exports&&exports&&"object"==typeof module&&module&&module.exports===exports?a(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(a){var b=a[0];return b.offsetWidth>0&&b.offsetHeight>0}function c(b){if(b.minTime&&(b.minTime=t(b.minTime)),b.maxTime&&(b.maxTime=t(b.maxTime)),b.durationTime&&"function"!=typeof b.durationTime&&(b.durationTime=t(b.durationTime)),"now"==b.scrollDefault)b.scrollDefault=function(){return b.roundingFunction(t(new Date),b)};else if(b.scrollDefault&&"function"!=typeof b.scrollDefault){var c=b.scrollDefault;b.scrollDefault=function(){return b.roundingFunction(t(c),b)}}else b.minTime&&(b.scrollDefault=function(){return b.roundingFunction(b.minTime,b)});if("string"===a.type(b.timeFormat)&&b.timeFormat.match(/[gh]/)&&(b._twelveHourTime=!0),b.showOnFocus===!1&&-1!=b.showOn.indexOf("focus")&&b.showOn.splice(b.showOn.indexOf("focus"),1),b.disableTimeRanges.length>0){for(var d in b.disableTimeRanges)b.disableTimeRanges[d]=[t(b.disableTimeRanges[d][0]),t(b.disableTimeRanges[d][1])];b.disableTimeRanges=b.disableTimeRanges.sort(function(a,b){return a[0]-b[0]});for(var d=b.disableTimeRanges.length-1;d>0;d--)b.disableTimeRanges[d][0]<=b.disableTimeRanges[d-1][1]&&(b.disableTimeRanges[d-1]=[Math.min(b.disableTimeRanges[d][0],b.disableTimeRanges[d-1][0]),Math.max(b.disableTimeRanges[d][1],b.disableTimeRanges[d-1][1])],b.disableTimeRanges.splice(d,1))}return b}function d(b){var c=b.data("timepicker-settings"),d=b.data("timepicker-list");if(d&&d.length&&(d.remove(),b.data("timepicker-list",!1)),c.useSelect){d=a("<select />",{"class":"ui-timepicker-select"});var g=d}else{d=a("<ul />",{"class":"ui-timepicker-list"});var g=a("<div />",{"class":"ui-timepicker-wrapper",tabindex:-1});g.css({display:"none",position:"absolute"}).append(d)}if(c.noneOption)if(c.noneOption===!0&&(c.noneOption=c.useSelect?"Time...":"None"),a.isArray(c.noneOption)){for(var i in c.noneOption)if(parseInt(i,10)==i){var k=e(c.noneOption[i],c.useSelect);d.append(k)}}else{var k=e(c.noneOption,c.useSelect);d.append(k)}if(c.className&&g.addClass(c.className),(null!==c.minTime||null!==c.durationTime)&&c.showDuration){"function"==typeof c.step?"function":c.step;g.addClass("ui-timepicker-with-duration"),g.addClass("ui-timepicker-step-"+c.step)}var l=c.minTime;"function"==typeof c.durationTime?l=t(c.durationTime()):null!==c.durationTime&&(l=c.durationTime);var n=null!==c.minTime?c.minTime:0,o=null!==c.maxTime?c.maxTime:n+v-1;n>o&&(o+=v),o===v-1&&"string"===a.type(c.timeFormat)&&c.show2400&&(o=v);var p=c.disableTimeRanges,w=0,x=p.length,z=c.step;"function"!=typeof z&&(z=function(){return c.step});for(var i=n,A=0;o>=i;A++,i+=60*z(A)){var B=i,C=s(B,c);if(c.useSelect){var D=a("<option />",{value:C});D.text(C)}else{var D=a("<li />");D.addClass(v/2>B%v?"ui-timepicker-am":"ui-timepicker-pm"),D.data("time",u(B,c)),D.text(C)}if((null!==c.minTime||null!==c.durationTime)&&c.showDuration){var E=r(i-l,c.step);if(c.useSelect)D.text(D.text()+" ("+E+")");else{var F=a("<span />",{"class":"ui-timepicker-duration"});F.text(" ("+E+")"),D.append(F)}}x>w&&(B>=p[w][1]&&(w+=1),p[w]&&B>=p[w][0]&&B<p[w][1]&&(c.useSelect?D.prop("disabled",!0):D.addClass("ui-timepicker-disabled"))),d.append(D)}if(g.data("timepicker-input",b),b.data("timepicker-list",g),c.useSelect)b.val()&&d.val(f(t(b.val()),c)),d.on("focus",function(){a(this).data("timepicker-input").trigger("showTimepicker")}),d.on("blur",function(){a(this).data("timepicker-input").trigger("hideTimepicker")}),d.on("change",function(){m(b,a(this).val(),"select")}),m(b,d.val(),"initial"),b.hide().after(d);else{var G=c.appendTo;"string"==typeof G?G=a(G):"function"==typeof G&&(G=G(b)),G.append(g),j(b,d),d.on("mousedown click","li",function(c){b.off("focus.timepicker"),b.on("focus.timepicker-ie-hack",function(){b.off("focus.timepicker-ie-hack"),b.on("focus.timepicker",y.show)}),h(b)||b[0].focus(),d.find("li").removeClass("ui-timepicker-selected"),a(this).addClass("ui-timepicker-selected"),q(b)&&(b.trigger("hideTimepicker"),d.on("mouseup.timepicker click.timepicker","li",function(a){d.off("mouseup.timepicker click.timepicker"),g.hide()}))})}}function e(b,c){var d,e,f;return"object"==typeof b?(d=b.label,e=b.className,f=b.value):"string"==typeof b?d=b:a.error("Invalid noneOption value"),c?a("<option />",{value:f,"class":e,text:d}):a("<li />",{"class":e,text:d}).data("time",String(f))}function f(a,b){return a=b.roundingFunction(a,b),null!==a?s(a,b):void 0}function g(b){if(b.target!=window){var c=a(b.target);c.closest(".ui-timepicker-input").length||c.closest(".ui-timepicker-wrapper").length||(y.hide(),a(document).unbind(".ui-timepicker"),a(window).unbind(".ui-timepicker"))}}function h(a){var b=a.data("timepicker-settings");return(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&b.disableTouchKeyboard}function i(b,c,d){if(!d&&0!==d)return!1;var e=b.data("timepicker-settings"),f=!1,d=e.roundingFunction(d,e);return c.find("li").each(function(b,c){var e=a(c);if("number"==typeof e.data("time"))return e.data("time")==d?(f=e,!1):void 0}),f}function j(a,b){b.find("li").removeClass("ui-timepicker-selected");var c=a.data("timepicker-settings"),d=t(l(a),c);if(null!==d){var e=i(a,b,d);if(e){var f=e.offset().top-b.offset().top;(f+e.outerHeight()>b.outerHeight()||0>f)&&b.scrollTop(b.scrollTop()+e.position().top-e.outerHeight()),(c.forceRoundTime||e.data("time")===d)&&e.addClass("ui-timepicker-selected")}}}function k(b,c){if("timepicker"!=c){var d=a(this);if(""===this.value)return void m(d,null,c);if(!d.is(":focus")||b&&"change"==b.type){var e=d.data("timepicker-settings"),f=t(this.value,e);if(null===f)return void d.trigger("timeFormatError");var g=!1;if(null!==e.minTime&&null!==e.maxTime&&(f<e.minTime||f>e.maxTime)&&(g=!0),a.each(e.disableTimeRanges,function(){return f>=this[0]&&f<this[1]?(g=!0,!1):void 0}),e.forceRoundTime){var h=e.roundingFunction(f,e);h!=f&&(f=h,c=null)}var i=s(f,e);g?(m(d,i,"error")||b&&"change"==b.type)&&d.trigger("timeRangeError"):m(d,i,c)}}}function l(a){return a.is("input")?a.val():a.data("ui-timepicker-value")}function m(a,b,c){if(a.is("input")){a.val(b);var d=a.data("timepicker-settings");d.useSelect&&"select"!=c&&"initial"!=c&&a.data("timepicker-list").val(f(t(b),d))}return a.data("ui-timepicker-value")!=b?(a.data("ui-timepicker-value",b),"select"==c?a.trigger("selectTime").trigger("changeTime").trigger("change","timepicker"):-1==["error","initial"].indexOf(c)&&a.trigger("changeTime"),!0):(a.trigger("selectTime"),!1)}function n(a){switch(a.keyCode){case 13:case 9:return;default:a.preventDefault()}}function o(c){var d=a(this),e=d.data("timepicker-list");if(!e||!b(e)){if(40!=c.keyCode)return!0;y.show.call(d.get(0)),e=d.data("timepicker-list"),h(d)||d.focus()}switch(c.keyCode){case 13:return q(d)&&(k.call(d.get(0),{type:"change"}),y.hide.apply(this)),c.preventDefault(),!1;case 38:var f=e.find(".ui-timepicker-selected");return f.length?f.is(":first-child")||(f.removeClass("ui-timepicker-selected"),f.prev().addClass("ui-timepicker-selected"),f.prev().position().top<f.outerHeight()&&e.scrollTop(e.scrollTop()-f.outerHeight())):(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")),!1;case 40:return f=e.find(".ui-timepicker-selected"),0===f.length?(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")):f.is(":last-child")||(f.removeClass("ui-timepicker-selected"),f.next().addClass("ui-timepicker-selected"),f.next().position().top+2*f.outerHeight()>e.outerHeight()&&e.scrollTop(e.scrollTop()+f.outerHeight())),!1;case 27:e.find("li").removeClass("ui-timepicker-selected"),y.hide();break;case 9:y.hide();break;default:return!0}}function p(c){var d=a(this),e=d.data("timepicker-list"),f=d.data("timepicker-settings");if(!e||!b(e)||f.disableTextInput)return!0;if("paste"===c.type||"cut"===c.type)return void setTimeout(function(){f.typeaheadHighlight?j(d,e):e.hide()},0);switch(c.keyCode){case 96:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:case 65:case 77:case 80:case 186:case 8:case 46:f.typeaheadHighlight?j(d,e):e.hide()}}function q(a){var b=a.data("timepicker-settings"),c=a.data("timepicker-list"),d=null,e=c.find(".ui-timepicker-selected");return e.hasClass("ui-timepicker-disabled")?!1:(e.length&&(d=e.data("time")),null!==d&&("string"!=typeof d&&(d=s(d,b)),m(a,d,"select")),!0)}function r(a,b){a=Math.abs(a);var c,d,e=Math.round(a/60),f=[];return 60>e?f=[e,w.mins]:(c=Math.floor(e/60),d=e%60,30==b&&30==d&&(c+=w.decimal+5),f.push(c),f.push(1==c?w.hr:w.hrs),30!=b&&d&&(f.push(d),f.push(w.mins))),f.join(" ")}function s(b,c){if("number"!=typeof b)return null;var d=parseInt(b%60),e=parseInt(b/60%60),f=parseInt(b/3600%24),g=new Date(1970,0,2,f,e,d,0);if(isNaN(g.getTime()))return null;if("function"===a.type(c.timeFormat))return c.timeFormat(g);for(var h,i,j="",k=0;k<c.timeFormat.length;k++)switch(i=c.timeFormat.charAt(k)){case"a":j+=g.getHours()>11?w.pm:w.am;break;case"A":j+=g.getHours()>11?w.PM:w.AM;break;case"g":h=g.getHours()%12,j+=0===h?"12":h;break;case"G":h=g.getHours(),b===v&&(h=c.show2400?24:0),j+=h;break;case"h":h=g.getHours()%12,0!==h&&10>h&&(h="0"+h),j+=0===h?"12":h;break;case"H":h=g.getHours(),b===v&&(h=c.show2400?24:0),j+=h>9?h:"0"+h;break;case"i":var e=g.getMinutes();j+=e>9?e:"0"+e;break;case"s":d=g.getSeconds(),j+=d>9?d:"0"+d;break;case"\\":k++,j+=c.timeFormat.charAt(k);break;default:j+=i}return j}function t(a,b){if(""===a||null===a)return null;if("object"==typeof a)return 3600*a.getHours()+60*a.getMinutes()+a.getSeconds();if("string"!=typeof a)return a;a=a.toLowerCase().replace(/[\s\.]/g,""),("a"==a.slice(-1)||"p"==a.slice(-1))&&(a+="m");var c="("+w.am.replace(".","")+"|"+w.pm.replace(".","")+"|"+w.AM.replace(".","")+"|"+w.PM.replace(".","")+")?",d=new RegExp("^"+c+"([0-9]?[0-9])\\W?([0-5][0-9])?\\W?([0-5][0-9])?"+c+"$"),e=a.match(d);if(!e)return null;var f=parseInt(1*e[2],10),g=e[1]||e[5],h=f,i=1*e[3]||0,j=1*e[4]||0;if(12>=f&&g){var k=g==w.pm||g==w.PM;h=12==f?k?12:0:f+(k?12:0)}else if(b){var l=3600*f+60*i+j;if(l>=v+(b.show2400?1:0)){if(b.wrapHours===!1)return null;h=f%24}}var m=3600*h+60*i+j;if(12>f&&!g&&b&&b._twelveHourTime&&b.scrollDefault){var n=m-b.scrollDefault();0>n&&n>=v/-2&&(m=(m+v/2)%v)}return m}function u(a,b){return a==v&&b.show2400?a:a%v}var v=86400,w={am:"am",pm:"pm",AM:"AM",PM:"PM",decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},x={appendTo:"body",className:null,closeOnWindowScroll:!1,disableTextInput:!1,disableTimeRanges:[],disableTouchKeyboard:!1,durationTime:null,forceRoundTime:!1,maxTime:null,minTime:null,noneOption:!1,orientation:"l",roundingFunction:function(a,b){if(null===a)return null;if("number"!=typeof b.step)return a;var c=a%(60*b.step),d=b.minTime||0;return c-=d%(60*b.step),c>=30*b.step?a+=60*b.step-c:a-=c,u(a,b)},scrollDefault:null,selectOnBlur:!1,show2400:!1,showDuration:!1,showOn:["click","focus"],showOnFocus:!0,step:30,stopScrollPropagation:!1,timeFormat:"g:ia",typeaheadHighlight:!0,useSelect:!1,wrapHours:!0},y={init:function(b){return this.each(function(){var e=a(this),f=[];for(var g in x)e.data(g)&&(f[g]=e.data(g));var h=a.extend({},x,b,f);if(h.lang&&(w=a.extend(w,h.lang)),h=c(h),e.data("timepicker-settings",h),e.addClass("ui-timepicker-input"),h.useSelect)d(e);else{if(e.prop("autocomplete","off"),h.showOn)for(var i in h.showOn)e.on(h.showOn[i]+".timepicker",y.show);e.on("change.timepicker",k),e.on("keydown.timepicker",o),e.on("keyup.timepicker",p),h.disableTextInput&&e.on("keydown.timepicker",n),e.on("cut.timepicker",p),e.on("paste.timepicker",p),k.call(e.get(0),null,"initial")}})},show:function(c){var e=a(this),f=e.data("timepicker-settings");if(c&&c.preventDefault(),f.useSelect)return void e.data("timepicker-list").focus();h(e)&&e.blur();var k=e.data("timepicker-list");if(!e.prop("readonly")&&(k&&0!==k.length&&"function"!=typeof f.durationTime||(d(e),k=e.data("timepicker-list")),!b(k))){e.data("ui-timepicker-value",e.val()),j(e,k),y.hide(),k.show();var m={};f.orientation.match(/r/)?m.left=e.offset().left+e.outerWidth()-k.outerWidth()+parseInt(k.css("marginLeft").replace("px",""),10):m.left=e.offset().left+parseInt(k.css("marginLeft").replace("px",""),10);var n;n=f.orientation.match(/t/)?"t":f.orientation.match(/b/)?"b":e.offset().top+e.outerHeight(!0)+k.outerHeight()>a(window).height()+a(window).scrollTop()?"t":"b","t"==n?(k.addClass("ui-timepicker-positioned-top"),m.top=e.offset().top-k.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)):(k.removeClass("ui-timepicker-positioned-top"),m.top=e.offset().top+e.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)),k.offset(m);var o=k.find(".ui-timepicker-selected");if(!o.length){var p=t(l(e));null!==p?o=i(e,k,p):f.scrollDefault&&(o=i(e,k,f.scrollDefault()))}if((!o.length||o.hasClass("ui-timepicker-disabled"))&&(o=k.find("li:not(.ui-timepicker-disabled):first")),o&&o.length){var q=k.scrollTop()+o.position().top-o.outerHeight();k.scrollTop(q)}else k.scrollTop(0);return f.stopScrollPropagation&&a(document).on("wheel.ui-timepicker",".ui-timepicker-wrapper",function(b){b.preventDefault();var c=a(this).scrollTop();a(this).scrollTop(c+b.originalEvent.deltaY)}),a(document).on("touchstart.ui-timepicker mousedown.ui-timepicker",g),a(window).on("resize.ui-timepicker",g),f.closeOnWindowScroll&&a(document).on("scroll.ui-timepicker",g),e.trigger("showTimepicker"),this}},hide:function(c){var d=a(this),e=d.data("timepicker-settings");return e&&e.useSelect&&d.blur(),a(".ui-timepicker-wrapper").each(function(){var c=a(this);if(b(c)){var d=c.data("timepicker-input"),e=d.data("timepicker-settings");e&&e.selectOnBlur&&q(d),c.hide(),d.trigger("hideTimepicker")}}),this},option:function(b,e){return"string"==typeof b&&"undefined"==typeof e?a(this).data("timepicker-settings")[b]:this.each(function(){var f=a(this),g=f.data("timepicker-settings"),h=f.data("timepicker-list");"object"==typeof b?g=a.extend(g,b):"string"==typeof b&&(g[b]=e),g=c(g),f.data("timepicker-settings",g),k.call(f.get(0),{type:"change"},"initial"),h&&(h.remove(),f.data("timepicker-list",!1)),g.useSelect&&d(f)})},getSecondsFromMidnight:function(){return t(l(this))},getTime:function(a){var b=this,c=l(b);if(!c)return null;var d=t(c);if(null===d)return null;a||(a=new Date);var e=new Date(a);return e.setHours(d/3600),e.setMinutes(d%3600/60),e.setSeconds(d%60),e.setMilliseconds(0),e},isVisible:function(){var a=this,c=a.data("timepicker-list");return!(!c||!b(c))},setTime:function(a){var b=this,c=b.data("timepicker-settings");if(c.forceRoundTime)var d=f(t(a),c);else var d=s(t(a),c);return a&&null===d&&c.noneOption&&(d=a),b.val(d),k.call(b.get(0),{type:"change"},"initial"),b.data("timepicker-list")&&j(b,b.data("timepicker-list")),this},remove:function(){var a=this;if(a.hasClass("ui-timepicker-input")){var b=a.data("timepicker-settings");return a.removeAttr("autocomplete","off"),a.removeClass("ui-timepicker-input"),a.removeData("timepicker-settings"),a.off(".timepicker"),a.data("timepicker-list")&&a.data("timepicker-list").remove(),b.useSelect&&a.show(),a.removeData("timepicker-list"),this}}};a.fn.timepicker=function(b){return this.length?y[b]?this.hasClass("ui-timepicker-input")?y[b].apply(this,Array.prototype.slice.call(arguments,1)):this:"object"!=typeof b&&b?void a.error("Method "+b+" does not exist on jQuery.timepicker"):y.init.apply(this,arguments):this}});

From 9c17957b4324ccf92a24f49dc0d98ad0f6ef4e0c Mon Sep 17 00:00:00 2001
From: angusmcleod <angus@mcleod.org.au>
Date: Mon, 12 Apr 2021 15:10:02 +1000
Subject: [PATCH 06/17] Apply to javascripts/discourse

---
 .../discourse/components/custom-field-input.js.es6 |  9 +++++----
 .../components/wizard-advanced-toggle.js.es6       |  2 +-
 .../components/wizard-custom-action.js.es6         |  4 ++--
 .../components/wizard-custom-field.js.es6          |  2 +-
 .../discourse/components/wizard-links.js.es6       |  8 ++++----
 .../components/wizard-mapper-input.js.es6          |  8 ++++----
 .../discourse/components/wizard-mapper-pair.js.es6 |  2 +-
 .../components/wizard-mapper-selector.js.es6       | 12 ++++++------
 .../components/wizard-realtime-validations.js.es6  |  2 +-
 .../controllers/admin-wizards-api-show.js.es6      | 14 +++++++-------
 .../controllers/admin-wizards-logs.js.es6          |  2 +-
 .../controllers/admin-wizards-wizard-show.js.es6   |  4 ++--
 .../initializers/custom-wizard-edits.js.es6        |  2 +-
 .../initializers/custom-wizard-redirect.js.es6     |  2 +-
 .../javascripts/discourse/lib/wizard-json.js.es6   |  2 +-
 .../javascripts/discourse/lib/wizard-mapper.js.es6 | 10 +++++-----
 .../javascripts/discourse/lib/wizard-schema.js.es6 |  2 +-
 .../discourse/mixins/undo-changes.js.es6           |  2 +-
 .../discourse/models/custom-wizard.js.es6          |  6 +++---
 19 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6
index 1ad0b152..12d93e12 100644
--- a/assets/javascripts/discourse/components/custom-field-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-field-input.js.es6
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { or, alias } from "@ember/object/computed";
+import { alias, or } from "@ember/object/computed";
+import I18n from "I18n";
 
 const generateContent = function (array, type) {
   return array.map((key) => ({
@@ -66,16 +67,16 @@ export default Component.extend({
     "field.serializers"
   )
   saveDisabled(saving) {
-    if (saving) return true;
+    if (saving) {return true;}
 
     const originalField = this.originalField;
-    if (!originalField) return false;
+    if (!originalField) {return false;}
 
     return ["name", "klass", "type", "serializers"].every((attr) => {
       let current = this.get(attr);
       let original = originalField[attr];
 
-      if (!current) return false;
+      if (!current) {return false;}
 
       if (attr == "serializers") {
         return this.compareArrays(current, original);
diff --git a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
index b03a7ce5..2c5b3434 100644
--- a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
+++ b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
@@ -7,7 +7,7 @@ export default Component.extend({
   @discourseComputed("showAdvanced")
   toggleClass(showAdvanced) {
     let classes = "btn";
-    if (showAdvanced) classes += " btn-primary";
+    if (showAdvanced) {classes += " btn-primary";}
     return classes;
   },
 
diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
index 3dcc85d1..9ea64caa 100644
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@@ -1,5 +1,5 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { equal, empty, or, and } from "@ember/object/computed";
+import { and, empty, equal, or } from "@ember/object/computed";
 import { generateName, selectKitContent } from "../lib/wizard";
 import { computed } from "@ember/object";
 import wizardSchema from "../lib/wizard-schema";
@@ -92,7 +92,7 @@ export default Component.extend(UndoChanges, {
 
   @discourseComputed("apis", "action.api")
   availableEndpoints(apis, api) {
-    if (!api) return [];
+    if (!api) {return [];}
     return apis.find((a) => a.name === api).endpoints;
   },
 });
diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
index 85c26677..09896a6c 100644
--- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
@@ -1,5 +1,5 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { equal, or, alias } 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";
diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6
index 6f2ca117..9f9d6a01 100644
--- a/assets/javascripts/discourse/components/wizard-links.js.es6
+++ b/assets/javascripts/discourse/components/wizard-links.js.es6
@@ -1,15 +1,15 @@
 import {
   default as discourseComputed,
-  on,
   observes,
+  on,
 } from "discourse-common/utils/decorators";
 import { generateName } from "../lib/wizard";
 import {
-  default as wizardSchema,
   setWizardDefaults,
+  default as wizardSchema,
 } from "../lib/wizard-schema";
 import { notEmpty } from "@ember/object/computed";
-import { scheduleOnce, bind } from "@ember/runloop";
+import { bind, scheduleOnce } from "@ember/runloop";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { A } from "@ember/array";
@@ -53,7 +53,7 @@ export default Component.extend({
     "items.@each.title"
   )
   links(current, items) {
-    if (!items) return;
+    if (!items) {return;}
 
     return items.map((item) => {
       if (item) {
diff --git a/assets/javascripts/discourse/components/wizard-mapper-input.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-input.js.es6
index c7327fbc..021f2084 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-input.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-input.js.es6
@@ -1,11 +1,11 @@
 import { computed, set } from "@ember/object";
-import { alias, equal, or, not } from "@ember/object/computed";
+import { alias, equal, not, or } from "@ember/object/computed";
 import {
-  newPair,
   connectorContent,
-  inputTypesContent,
-  defaultSelectionType,
   defaultConnector,
+  defaultSelectionType,
+  inputTypesContent,
+  newPair,
 } from "../lib/wizard-mapper";
 import Component from "@ember/component";
 import { observes } from "discourse-common/utils/decorators";
diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
index bc7e9be9..19d7071f 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
@@ -1,5 +1,5 @@
 import { connectorContent } from "../lib/wizard-mapper";
-import { gt, or, alias } from "@ember/object/computed";
+import { alias, gt, or } from "@ember/object/computed";
 import { computed, observes } from "@ember/object";
 import Component from "@ember/component";
 
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
index e70708c9..349e7d7d 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@@ -1,4 +1,4 @@
-import { alias, or, gt } from "@ember/object/computed";
+import { alias, gt, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import {
   default as discourseComputed,
@@ -7,7 +7,7 @@ import {
 } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
-import { snakeCase, generateName, userProperties } from "../lib/wizard";
+import { generateName, snakeCase, userProperties } from "../lib/wizard";
 import Component from "@ember/component";
 import { bind, later } from "@ember/runloop";
 import I18n from "I18n";
@@ -135,7 +135,7 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state == "destroying") return;
+    if (this._state == "destroying") {return;}
     let $target = $(e.target);
 
     if (!$target.parents(".type-selector").length && this.showTypes) {
@@ -275,11 +275,11 @@ export default Component.extend({
 
   optionEnabled(type) {
     const options = this.options;
-    if (!options) return false;
+    if (!options) {return false;}
 
     const option = options[type];
-    if (option === true) return true;
-    if (typeof option !== "string") return false;
+    if (option === true) {return true;}
+    if (typeof option !== "string") {return false;}
 
     return option.split(",").filter((option) => {
       return [this.selectorType, this.inputType].indexOf(option) !== -1;
diff --git a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
index b9b36e6f..55f98cdb 100644
--- a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
+++ b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
@@ -19,7 +19,7 @@ export default Component.extend({
 
   init() {
     this._super(...arguments);
-    if (!this.validations) return;
+    if (!this.validations) {return;}
 
     if (!this.field.validations) {
       const validations = {};
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index f330c00c..f13652e5 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import CustomWizardApi from "../models/custom-wizard-api";
 import { default as discourseComputed } from "discourse-common/utils/decorators";
-import { not, and, equal } from "@ember/object/computed";
+import { and, equal, not } from "@ember/object/computed";
 import { selectKitContent } from "../lib/wizard";
 import Controller from "@ember/controller";
 import I18n from "I18n";
@@ -64,8 +64,8 @@ export default Controller.extend({
     threeLeggedOauth
   ) {
     if (saveDisabled || !authType || !tokenUrl || !clientId || !clientSecret)
-      return true;
-    if (threeLeggedOauth) return !authUrl;
+      {return true;}
+    if (threeLeggedOauth) {return !authUrl;}
     return false;
   },
 
@@ -149,13 +149,13 @@ export default Controller.extend({
       let refreshList = false;
       let error;
 
-      if (!name || !authType) return;
+      if (!name || !authType) {return;}
 
       let data = {
         auth_type: authType,
       };
 
-      if (api.title) data["title"] = api.title;
+      if (api.title) {data["title"] = api.title;}
 
       const originalTitle = this.get("api.originalTitle");
       if (api.get("isNew") || (originalTitle && api.title !== originalTitle)) {
@@ -232,7 +232,7 @@ export default Controller.extend({
 
     remove() {
       const name = this.get("api.name");
-      if (!name) return;
+      if (!name) {return;}
 
       this.set("updating", true);
 
@@ -250,7 +250,7 @@ export default Controller.extend({
 
     clearLogs() {
       const name = this.get("api.name");
-      if (!name) return;
+      if (!name) {return;}
 
       ajax(`/admin/wizards/api/${name.underscore()}/logs`, {
         type: "DELETE",
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
index 5a03f064..bc720ffd 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
@@ -13,7 +13,7 @@ export default Controller.extend({
   logs: [],
 
   loadLogs() {
-    if (!this.canLoadMore) return;
+    if (!this.canLoadMore) {return;}
 
     this.set("refreshing", true);
 
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index 68dee12e..f975c2f0 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -3,13 +3,13 @@ import {
   observes,
   on,
 } from "discourse-common/utils/decorators";
-import { notEmpty, alias } from "@ember/object/computed";
+import { alias, notEmpty } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
 import { generateId, wizardFieldList } from "../lib/wizard";
 import { buildProperties } from "../lib/wizard-json";
 import { dasherize } from "@ember/string";
 import EmberObject from "@ember/object";
-import { scheduleOnce, later } from "@ember/runloop";
+import { later, scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import copyText from "discourse/lib/copy-text";
 import CustomWizard from "../models/custom-wizard";
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
index 73eae8b9..0b725d41 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
@@ -6,7 +6,7 @@ export default {
   initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
 
-    if (!siteSettings.custom_wizard_enabled) return;
+    if (!siteSettings.custom_wizard_enabled) {return;}
 
     const existing = DiscourseURL.routeTo;
     DiscourseURL.routeTo = function (path, opts) {
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
index ae4db35b..22afd4de 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
@@ -8,7 +8,7 @@ export default {
     const messageBus = container.lookup("message-bus:main");
     const siteSettings = container.lookup("site-settings:main");
 
-    if (!siteSettings.custom_wizard_enabled || !messageBus) return;
+    if (!siteSettings.custom_wizard_enabled || !messageBus) {return;}
 
     messageBus.subscribe("/redirect_to_wizard", function (wizardId) {
       const wizardUrl = window.location.origin + "/w/" + wizardId;
diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6
index ec85bb19..ff2c5a5b 100644
--- a/assets/javascripts/discourse/lib/wizard-json.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-json.js.es6
@@ -1,4 +1,4 @@
-import { listProperties, camelCase, snakeCase } from "../lib/wizard";
+import { camelCase, listProperties, snakeCase } from "../lib/wizard";
 import wizardSchema from "../lib/wizard-schema";
 import EmberObject from "@ember/object";
 import { A } from "@ember/array";
diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
index 8af93297..a8cc8e34 100644
--- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
@@ -43,13 +43,13 @@ function defaultConnector(connectorType, inputType, options = {}) {
     return defaultInputType(options);
   }
   if (connectorType === "pair") {
-    if (inputType === "conditional") return "equal";
-    if (inputType === "association") return "association";
-    if (inputType === "validation") return "equal";
+    if (inputType === "conditional") {return "equal";}
+    if (inputType === "association") {return "association";}
+    if (inputType === "validation") {return "equal";}
   }
   if (connectorType === "output") {
-    if (inputType === "conditional") return "then";
-    if (inputType === "assignment") return "set";
+    if (inputType === "conditional") {return "then";}
+    if (inputType === "assignment") {return "set";}
   }
   return "equal";
 }
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6
index 1a1455f8..54d3b255 100644
--- a/assets/javascripts/discourse/lib/wizard-schema.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6
@@ -1,4 +1,4 @@
-import { set, get } from "@ember/object";
+import { get, set } from "@ember/object";
 
 const wizard = {
   basic: {
diff --git a/assets/javascripts/discourse/mixins/undo-changes.js.es6 b/assets/javascripts/discourse/mixins/undo-changes.js.es6
index 61608cf2..c8d42c52 100644
--- a/assets/javascripts/discourse/mixins/undo-changes.js.es6
+++ b/assets/javascripts/discourse/mixins/undo-changes.js.es6
@@ -1,6 +1,6 @@
 import { listProperties } from "../lib/wizard";
 import { default as wizardSchema } from "../lib/wizard-schema";
-import { set, get } from "@ember/object";
+import { get, set } from "@ember/object";
 import Mixin from "@ember/object/mixin";
 import { observes } from "discourse-common/utils/decorators";
 import { deepEqual } from "discourse-common/lib/object";
diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6
index aa9c1145..d47df6db 100644
--- a/assets/javascripts/discourse/models/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard.js.es6
@@ -1,7 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
-import { buildProperties, present, mapped } from "../lib/wizard-json";
-import { listProperties, camelCase, snakeCase } from "../lib/wizard";
+import { buildProperties, mapped, present } from "../lib/wizard-json";
+import { camelCase, listProperties, snakeCase } from "../lib/wizard";
 import wizardSchema from "../lib/wizard-schema";
 import { Promise } from "rsvp";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -132,7 +132,7 @@ const CustomWizard = EmberObject.extend({
   },
 
   buildMappedJson(inputs) {
-    if (!inputs || !inputs.length) return false;
+    if (!inputs || !inputs.length) {return false;}
 
     let result = [];
 

From 8171fc730cc6c96b74a1a19ae56a75a7f30078ca Mon Sep 17 00:00:00 2001
From: angusmcleod <angus@mcleod.org.au>
Date: Mon, 12 Apr 2021 15:44:47 +1000
Subject: [PATCH 07/17] Apply es-lint to javascripts/discourse

---
 .../discourse/components/custom-field-input.js.es6    |  6 +++---
 .../discourse/components/wizard-custom-action.js.es6  |  5 ++---
 .../discourse/components/wizard-custom-step.js.es6    |  1 -
 .../discourse/components/wizard-links.js.es6          |  2 +-
 .../components/wizard-mapper-connector.js.es6         |  1 -
 .../discourse/components/wizard-mapper-pair.js.es6    |  4 ++--
 .../components/wizard-mapper-selector.js.es6          | 11 +++++------
 .../discourse/components/wizard-mapper.js.es6         |  7 +------
 .../discourse/components/wizard-text-editor.js.es6    |  5 +----
 .../controllers/admin-wizards-api-show.js.es6         |  2 +-
 .../controllers/admin-wizards-custom-fields.js.es6    |  6 +-----
 .../discourse/controllers/admin-wizards-logs.js.es6   |  6 ++----
 .../controllers/admin-wizards-manager.js.es6          |  9 +++------
 .../controllers/admin-wizards-wizard-show.js.es6      |  8 ++------
 .../discourse/initializers/custom-wizard-edits.js.es6 |  1 -
 assets/javascripts/discourse/lib/wizard-json.js.es6   |  2 +-
 assets/javascripts/discourse/lib/wizard-mapper.js.es6 |  7 +++++++
 assets/javascripts/discourse/lib/wizard-schema.js.es6 |  2 +-
 assets/javascripts/discourse/lib/wizard.js.es6        |  8 ++++----
 .../javascripts/discourse/mixins/undo-changes.js.es6  |  3 +--
 .../javascripts/discourse/models/custom-wizard.js.es6 |  2 +-
 .../discourse/routes/admin-wizards-api.js.es6         |  2 +-
 22 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6
index 12d93e12..8be7e24b 100644
--- a/assets/javascripts/discourse/components/custom-field-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-field-input.js.es6
@@ -35,7 +35,7 @@ export default Component.extend({
   },
 
   @discourseComputed("field.klass")
-  serializerContent(klass, p2) {
+  serializerContent(klass) {
     const serializers = this.get(`${klass}Serializers`);
 
     if (serializers) {
@@ -78,10 +78,10 @@ export default Component.extend({
 
       if (!current) {return false;}
 
-      if (attr == "serializers") {
+      if (attr === "serializers") {
         return this.compareArrays(current, original);
       } else {
-        return current == original;
+        return current === original;
       }
     });
   },
diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
index 9ea64caa..6d21eaaf 100644
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@@ -1,11 +1,10 @@
 import { default as discourseComputed } from "discourse-common/utils/decorators";
 import { and, empty, equal, or } from "@ember/object/computed";
-import { generateName, selectKitContent } from "../lib/wizard";
+import { notificationLevels, selectKitContent } from "../lib/wizard";
 import { computed } from "@ember/object";
 import wizardSchema from "../lib/wizard-schema";
 import UndoChanges from "../mixins/undo-changes";
 import Component from "@ember/component";
-import { notificationLevels } from "../lib/wizard";
 import I18n from "I18n";
 
 export default Component.extend(UndoChanges, {
@@ -43,7 +42,7 @@ export default Component.extend(UndoChanges, {
       name: I18n.t(`admin.wizard.action.${type}.label`),
     };
   }),
-  availableNotificationLevels: notificationLevels.map((type, index) => {
+  availableNotificationLevels: notificationLevels.map((type) => {
     return {
       id: type,
       name: I18n.t(
diff --git a/assets/javascripts/discourse/components/wizard-custom-step.js.es6 b/assets/javascripts/discourse/components/wizard-custom-step.js.es6
index 102af717..5715bbda 100644
--- a/assets/javascripts/discourse/components/wizard-custom-step.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-step.js.es6
@@ -1,5 +1,4 @@
 import Component from "@ember/component";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: "wizard-custom-step",
diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6
index 9f9d6a01..dde84e95 100644
--- a/assets/javascripts/discourse/components/wizard-links.js.es6
+++ b/assets/javascripts/discourse/components/wizard-links.js.es6
@@ -9,7 +9,7 @@ import {
   default as wizardSchema,
 } from "../lib/wizard-schema";
 import { notEmpty } from "@ember/object/computed";
-import { bind, scheduleOnce } from "@ember/runloop";
+import { scheduleOnce } from "@ember/runloop";
 import EmberObject from "@ember/object";
 import Component from "@ember/component";
 import { A } from "@ember/array";
diff --git a/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6
index 36c0ec20..3ec2d502 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-connector.js.es6
@@ -3,7 +3,6 @@ import { gt } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import { defaultConnector } from "../lib/wizard-mapper";
 import { later } from "@ember/runloop";
-import { observes } from "discourse-common/utils/decorators";
 import I18n from "I18n";
 
 export default Component.extend({
diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
index 19d7071f..cb237056 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-pair.js.es6
@@ -1,6 +1,6 @@
 import { connectorContent } from "../lib/wizard-mapper";
-import { alias, gt, or } from "@ember/object/computed";
-import { computed, observes } from "@ember/object";
+import { alias, gt } from "@ember/object/computed";
+import { computed } from "@ember/object";
 import Component from "@ember/component";
 
 export default Component.extend({
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
index 349e7d7d..7e7e9b67 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@@ -2,8 +2,7 @@ import { alias, gt, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import {
   default as discourseComputed,
-  observes,
-  on,
+  observes
 } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
@@ -135,7 +134,7 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state == "destroying") {return;}
+    if (this._state === "destroying") {return;}
     let $target = $(e.target);
 
     if (!$target.parents(".type-selector").length && this.showTypes) {
@@ -249,7 +248,7 @@ export default Component.extend({
   },
 
   @discourseComputed("activeType", "inputType")
-  placeholderKey(activeType, inputType) {
+  placeholderKey(activeType) {
     if (
       activeType === "text" &&
       this.options[`${this.selectorType}Placeholder`]
@@ -281,8 +280,8 @@ export default Component.extend({
     if (option === true) {return true;}
     if (typeof option !== "string") {return false;}
 
-    return option.split(",").filter((option) => {
-      return [this.selectorType, this.inputType].indexOf(option) !== -1;
+    return option.split(",").filter((o) => {
+      return [this.selectorType, this.inputType].indexOf(o) !== -1;
     }).length;
   },
 
diff --git a/assets/javascripts/discourse/components/wizard-mapper.js.es6 b/assets/javascripts/discourse/components/wizard-mapper.js.es6
index 7581adbd..95aabb1c 100644
--- a/assets/javascripts/discourse/components/wizard-mapper.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper.js.es6
@@ -1,10 +1,5 @@
-import { getOwner } from "discourse-common/lib/get-owner";
 import { newInput, selectionTypes } from "../lib/wizard-mapper";
-import {
-  default as discourseComputed,
-  observes,
-  on,
-} from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { later } from "@ember/runloop";
 import Component from "@ember/component";
 import { A } from "@ember/array";
diff --git a/assets/javascripts/discourse/components/wizard-text-editor.js.es6 b/assets/javascripts/discourse/components/wizard-text-editor.js.es6
index 2866537d..88d7200c 100644
--- a/assets/javascripts/discourse/components/wizard-text-editor.js.es6
+++ b/assets/javascripts/discourse/components/wizard-text-editor.js.es6
@@ -1,7 +1,4 @@
-import {
-  default as discourseComputed,
-  on,
-} from "discourse-common/utils/decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import { notEmpty } from "@ember/object/computed";
 import { userProperties } from "../lib/wizard";
 import { scheduleOnce } from "@ember/runloop";
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index f13652e5..16493715 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -146,7 +146,7 @@ export default Controller.extend({
       const api = this.get("api");
       const name = api.name;
       const authType = api.authType;
-      let refreshList = false;
+      let refreshList = false; // eslint-disable-line
       let error;
 
       if (!name || !authType) {return;}
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
index c1254d3b..2081cfe3 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-custom-fields.js.es6
@@ -1,9 +1,5 @@
 import Controller from "@ember/controller";
-import EmberObject from "@ember/object";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import CustomWizardCustomField from "../models/custom-wizard-custom-field";
-import { default as discourseComputed } from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   messageKey: "create",
@@ -49,7 +45,7 @@ export default Controller.extend({
     },
 
     removeField(field) {
-      return CustomWizardCustomField.destroyField(field).then((result) => {
+      return CustomWizardCustomField.destroyField(field).then(() => {
         this.get("customFields").removeObject(field);
       });
     },
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
index bc720ffd..3002b95a 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
@@ -1,6 +1,4 @@
-import { default as computed } from "discourse-common/utils/decorators";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { ajax } from "discourse/lib/ajax";
+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";
@@ -27,7 +25,7 @@ export default Controller.extend({
       .finally(() => this.set("refreshing", false));
   },
 
-  @computed("hasLogs", "refreshing")
+  @discourseComputed("hasLogs", "refreshing")
   noResults(hasLogs, refreshing) {
     return !hasLogs && !refreshing;
   },
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
index 840d68b1..7228d164 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
@@ -1,8 +1,5 @@
 import Controller from "@ember/controller";
-import {
-  default as discourseComputed,
-  observes,
-} from "discourse-common/utils/decorators";
+import { observes } from "discourse-common/utils/decorators";
 import { empty } from "@ember/object/computed";
 import CustomWizardManager from "../models/custom-wizard-manager";
 import { A } from "@ember/array";
@@ -196,7 +193,7 @@ export default Controller.extend({
     },
 
     destroy() {
-      const destroyWizards = this.get("destroyWizards");
+      let destroyWizards = this.get("destroyWizards");
 
       if (!destroyWizards.length) {
         this.setMessage("error", "none_selected");
@@ -227,7 +224,7 @@ export default Controller.extend({
 
               if (result.destroyed.length) {
                 const destroyedIds = result.destroyed.map((d) => d.id);
-                const destroyWizards = this.get("destroyWizards");
+                destroyWizards = this.get("destroyWizards");
                 const wizards = this.get("wizards");
 
                 wizards.removeObjects(
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index f975c2f0..773fed24 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -1,18 +1,14 @@
 import {
   default as discourseComputed,
-  observes,
-  on,
+  observes
 } from "discourse-common/utils/decorators";
-import { alias, notEmpty } from "@ember/object/computed";
+import { notEmpty } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
 import { generateId, wizardFieldList } from "../lib/wizard";
-import { buildProperties } from "../lib/wizard-json";
 import { dasherize } from "@ember/string";
-import EmberObject from "@ember/object";
 import { later, scheduleOnce } from "@ember/runloop";
 import Controller from "@ember/controller";
 import copyText from "discourse/lib/copy-text";
-import CustomWizard from "../models/custom-wizard";
 import I18n from "I18n";
 
 export default Controller.extend({
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
index 0b725d41..610b80bc 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
@@ -1,4 +1,3 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
 import DiscourseURL from "discourse/lib/url";
 
 export default {
diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6
index ff2c5a5b..4b0aaa3d 100644
--- a/assets/javascripts/discourse/lib/wizard-json.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-json.js.es6
@@ -1,4 +1,4 @@
-import { camelCase, listProperties, snakeCase } from "../lib/wizard";
+import { camelCase, listProperties } from "../lib/wizard";
 import wizardSchema from "../lib/wizard-schema";
 import EmberObject from "@ember/object";
 import { A } from "@ember/array";
diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
index a8cc8e34..5fe35996 100644
--- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
@@ -4,6 +4,13 @@ import I18n from "I18n";
 
 // Inputs
 
+const selectableInputTypes = [
+  'conditional',
+  'assignment',
+  'association',
+  'validation'
+];
+
 function defaultInputType(options = {}) {
   return options.inputTypes.split(",")[0];
 }
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6
index 54d3b255..effd8a5c 100644
--- a/assets/javascripts/discourse/lib/wizard-schema.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6
@@ -225,7 +225,7 @@ if (Discourse.SiteSettings.wizard_apis_enabled) {
   };
 }
 
-export function setWizardDefaults(obj, itemType, opts = {}) {
+export function setWizardDefaults(obj, itemType) {
   const objSchema = wizardSchema[itemType];
   const basicDefaults = objSchema.basic;
 
diff --git a/assets/javascripts/discourse/lib/wizard.js.es6 b/assets/javascripts/discourse/lib/wizard.js.es6
index 4746fda1..1896b1fe 100644
--- a/assets/javascripts/discourse/lib/wizard.js.es6
+++ b/assets/javascripts/discourse/lib/wizard.js.es6
@@ -9,7 +9,7 @@ function generateName(id) {
   return id ? sentenceCase(id) : "";
 }
 
-function generateId(name, opts = {}) {
+function generateId(name) {
   return name ? snakeCase(name) : "";
 }
 
@@ -60,10 +60,10 @@ const notificationLevels = [
   "muted",
 ];
 
-function listProperties(type, opts = {}) {
-  let properties = Object.keys(wizardSchema[type].basic);
+function listProperties(itemType, opts = {}) {
+  let properties = Object.keys(wizardSchema[itemType].basic);
 
-  const types = wizardSchema[type].types;
+  const types = wizardSchema[itemType].types;
 
   if (types) {
     let typeProperties = [];
diff --git a/assets/javascripts/discourse/mixins/undo-changes.js.es6 b/assets/javascripts/discourse/mixins/undo-changes.js.es6
index c8d42c52..b2ab322d 100644
--- a/assets/javascripts/discourse/mixins/undo-changes.js.es6
+++ b/assets/javascripts/discourse/mixins/undo-changes.js.es6
@@ -2,7 +2,6 @@ import { listProperties } from "../lib/wizard";
 import { default as wizardSchema } from "../lib/wizard-schema";
 import { get, set } from "@ember/object";
 import Mixin from "@ember/object/mixin";
-import { observes } from "discourse-common/utils/decorators";
 import { deepEqual } from "discourse-common/lib/object";
 
 export default Mixin.create({
@@ -97,7 +96,6 @@ export default Mixin.create({
   actions: {
     undoChanges() {
       const componentType = this.componentType;
-      const original = this.get("originalObject");
       const obj = this.get(componentType);
 
       this.removeObservers(obj.type);
@@ -118,6 +116,7 @@ export default Mixin.create({
       this.setupObservers(type);
     },
 
+    // eslint-disable-next-line
     mappedFieldUpdated(property, mappedComponent, type) {
       const obj = this.get(this.componentType);
       obj.notifyPropertyChange(property);
diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6
index d47df6db..07bdb7b0 100644
--- a/assets/javascripts/discourse/models/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard.js.es6
@@ -1,7 +1,7 @@
 import { ajax } from "discourse/lib/ajax";
 import EmberObject from "@ember/object";
 import { buildProperties, mapped, present } from "../lib/wizard-json";
-import { camelCase, listProperties, snakeCase } from "../lib/wizard";
+import { listProperties, snakeCase } from "../lib/wizard";
 import wizardSchema from "../lib/wizard-schema";
 import { Promise } from "rsvp";
 import { popupAjaxError } from "discourse/lib/ajax-error";
diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
index 927af8c8..541ab028 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
@@ -8,7 +8,7 @@ export default DiscourseRoute.extend({
 
   setupController(controller, model) {
     const showParams = this.paramsFor("adminWizardsApiShow");
-    const apiName = showParams.name == "create" ? null : showParams.name;
+    const apiName = showParams.name === "create" ? null : showParams.name;
     const apiList = (model || []).map((api) => {
       return {
         id: api.name,

From 54c00f17841fa3eca7cf527308b56de047df2b5c Mon Sep 17 00:00:00 2001
From: angusmcleod <angus@mcleod.org.au>
Date: Mon, 12 Apr 2021 16:12:20 +1000
Subject: [PATCH 08/17] Apply prettier to recent changes

---
 .../components/custom-field-input.js.es6      | 12 ++++++--
 .../components/wizard-advanced-toggle.js.es6  |  4 ++-
 .../components/wizard-custom-action.js.es6    |  4 ++-
 .../discourse/components/wizard-links.js.es6  |  4 ++-
 .../components/wizard-mapper-selector.js.es6  | 18 ++++++++----
 .../wizard-realtime-validations.js.es6        |  4 ++-
 .../controllers/admin-wizards-api-show.js.es6 | 25 ++++++++++++-----
 .../controllers/admin-wizards-logs.js.es6     |  4 ++-
 .../admin-wizards-wizard-show.js.es6          |  2 +-
 .../initializers/custom-wizard-edits.js.es6   |  4 ++-
 .../custom-wizard-redirect.js.es6             |  4 ++-
 .../discourse/lib/wizard-mapper.js.es6        | 28 +++++++++++++------
 .../discourse/models/custom-wizard.js.es6     |  4 ++-
 13 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/assets/javascripts/discourse/components/custom-field-input.js.es6 b/assets/javascripts/discourse/components/custom-field-input.js.es6
index 8be7e24b..f2dca4c7 100644
--- a/assets/javascripts/discourse/components/custom-field-input.js.es6
+++ b/assets/javascripts/discourse/components/custom-field-input.js.es6
@@ -67,16 +67,22 @@ export default Component.extend({
     "field.serializers"
   )
   saveDisabled(saving) {
-    if (saving) {return true;}
+    if (saving) {
+      return true;
+    }
 
     const originalField = this.originalField;
-    if (!originalField) {return false;}
+    if (!originalField) {
+      return false;
+    }
 
     return ["name", "klass", "type", "serializers"].every((attr) => {
       let current = this.get(attr);
       let original = originalField[attr];
 
-      if (!current) {return false;}
+      if (!current) {
+        return false;
+      }
 
       if (attr === "serializers") {
         return this.compareArrays(current, original);
diff --git a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6 b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
index 2c5b3434..c6e1fd9c 100644
--- a/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
+++ b/assets/javascripts/discourse/components/wizard-advanced-toggle.js.es6
@@ -7,7 +7,9 @@ export default Component.extend({
   @discourseComputed("showAdvanced")
   toggleClass(showAdvanced) {
     let classes = "btn";
-    if (showAdvanced) {classes += " btn-primary";}
+    if (showAdvanced) {
+      classes += " btn-primary";
+    }
     return classes;
   },
 
diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
index 6d21eaaf..c8309f10 100644
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@@ -91,7 +91,9 @@ export default Component.extend(UndoChanges, {
 
   @discourseComputed("apis", "action.api")
   availableEndpoints(apis, api) {
-    if (!api) {return [];}
+    if (!api) {
+      return [];
+    }
     return apis.find((a) => a.name === api).endpoints;
   },
 });
diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6
index dde84e95..5d82a57d 100644
--- a/assets/javascripts/discourse/components/wizard-links.js.es6
+++ b/assets/javascripts/discourse/components/wizard-links.js.es6
@@ -53,7 +53,9 @@ export default Component.extend({
     "items.@each.title"
   )
   links(current, items) {
-    if (!items) {return;}
+    if (!items) {
+      return;
+    }
 
     return items.map((item) => {
       if (item) {
diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
index 7e7e9b67..6d65d782 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@@ -2,7 +2,7 @@ import { alias, gt, or } from "@ember/object/computed";
 import { computed } from "@ember/object";
 import {
   default as discourseComputed,
-  observes
+  observes,
 } from "discourse-common/utils/decorators";
 import { getOwner } from "discourse-common/lib/get-owner";
 import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
@@ -134,7 +134,9 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state === "destroying") {return;}
+    if (this._state === "destroying") {
+      return;
+    }
     let $target = $(e.target);
 
     if (!$target.parents(".type-selector").length && this.showTypes) {
@@ -274,11 +276,17 @@ export default Component.extend({
 
   optionEnabled(type) {
     const options = this.options;
-    if (!options) {return false;}
+    if (!options) {
+      return false;
+    }
 
     const option = options[type];
-    if (option === true) {return true;}
-    if (typeof option !== "string") {return false;}
+    if (option === true) {
+      return true;
+    }
+    if (typeof option !== "string") {
+      return false;
+    }
 
     return option.split(",").filter((o) => {
       return [this.selectorType, this.inputType].indexOf(o) !== -1;
diff --git a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6 b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
index 55f98cdb..8332b86e 100644
--- a/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
+++ b/assets/javascripts/discourse/components/wizard-realtime-validations.js.es6
@@ -19,7 +19,9 @@ export default Component.extend({
 
   init() {
     this._super(...arguments);
-    if (!this.validations) {return;}
+    if (!this.validations) {
+      return;
+    }
 
     if (!this.field.validations) {
       const validations = {};
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index 16493715..5dba2d7f 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -63,9 +63,12 @@ export default Controller.extend({
     clientSecret,
     threeLeggedOauth
   ) {
-    if (saveDisabled || !authType || !tokenUrl || !clientId || !clientSecret)
-      {return true;}
-    if (threeLeggedOauth) {return !authUrl;}
+    if (saveDisabled || !authType || !tokenUrl || !clientId || !clientSecret) {
+      return true;
+    }
+    if (threeLeggedOauth) {
+      return !authUrl;
+    }
     return false;
   },
 
@@ -149,13 +152,17 @@ export default Controller.extend({
       let refreshList = false; // eslint-disable-line
       let error;
 
-      if (!name || !authType) {return;}
+      if (!name || !authType) {
+        return;
+      }
 
       let data = {
         auth_type: authType,
       };
 
-      if (api.title) {data["title"] = api.title;}
+      if (api.title) {
+        data["title"] = api.title;
+      }
 
       const originalTitle = this.get("api.originalTitle");
       if (api.get("isNew") || (originalTitle && api.title !== originalTitle)) {
@@ -232,7 +239,9 @@ export default Controller.extend({
 
     remove() {
       const name = this.get("api.name");
-      if (!name) {return;}
+      if (!name) {
+        return;
+      }
 
       this.set("updating", true);
 
@@ -250,7 +259,9 @@ export default Controller.extend({
 
     clearLogs() {
       const name = this.get("api.name");
-      if (!name) {return;}
+      if (!name) {
+        return;
+      }
 
       ajax(`/admin/wizards/api/${name.underscore()}/logs`, {
         type: "DELETE",
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
index 3002b95a..9559b01b 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-logs.js.es6
@@ -11,7 +11,9 @@ export default Controller.extend({
   logs: [],
 
   loadLogs() {
-    if (!this.canLoadMore) {return;}
+    if (!this.canLoadMore) {
+      return;
+    }
 
     this.set("refreshing", true);
 
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index 773fed24..332efedd 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -1,6 +1,6 @@
 import {
   default as discourseComputed,
-  observes
+  observes,
 } from "discourse-common/utils/decorators";
 import { notEmpty } from "@ember/object/computed";
 import showModal from "discourse/lib/show-modal";
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
index 610b80bc..63ddd5e8 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6
@@ -5,7 +5,9 @@ export default {
   initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
 
-    if (!siteSettings.custom_wizard_enabled) {return;}
+    if (!siteSettings.custom_wizard_enabled) {
+      return;
+    }
 
     const existing = DiscourseURL.routeTo;
     DiscourseURL.routeTo = function (path, opts) {
diff --git a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
index 22afd4de..21dd0e81 100644
--- a/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
+++ b/assets/javascripts/discourse/initializers/custom-wizard-redirect.js.es6
@@ -8,7 +8,9 @@ export default {
     const messageBus = container.lookup("message-bus:main");
     const siteSettings = container.lookup("site-settings:main");
 
-    if (!siteSettings.custom_wizard_enabled || !messageBus) {return;}
+    if (!siteSettings.custom_wizard_enabled || !messageBus) {
+      return;
+    }
 
     messageBus.subscribe("/redirect_to_wizard", function (wizardId) {
       const wizardUrl = window.location.origin + "/w/" + wizardId;
diff --git a/assets/javascripts/discourse/lib/wizard-mapper.js.es6 b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
index 5fe35996..29315b9c 100644
--- a/assets/javascripts/discourse/lib/wizard-mapper.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-mapper.js.es6
@@ -5,10 +5,10 @@ import I18n from "I18n";
 // Inputs
 
 const selectableInputTypes = [
-  'conditional',
-  'assignment',
-  'association',
-  'validation'
+  "conditional",
+  "assignment",
+  "association",
+  "validation",
 ];
 
 function defaultInputType(options = {}) {
@@ -50,13 +50,23 @@ function defaultConnector(connectorType, inputType, options = {}) {
     return defaultInputType(options);
   }
   if (connectorType === "pair") {
-    if (inputType === "conditional") {return "equal";}
-    if (inputType === "association") {return "association";}
-    if (inputType === "validation") {return "equal";}
+    if (inputType === "conditional") {
+      return "equal";
+    }
+    if (inputType === "association") {
+      return "association";
+    }
+    if (inputType === "validation") {
+      return "equal";
+    }
   }
   if (connectorType === "output") {
-    if (inputType === "conditional") {return "then";}
-    if (inputType === "assignment") {return "set";}
+    if (inputType === "conditional") {
+      return "then";
+    }
+    if (inputType === "assignment") {
+      return "set";
+    }
   }
   return "equal";
 }
diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6
index 07bdb7b0..7d97183f 100644
--- a/assets/javascripts/discourse/models/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard.js.es6
@@ -132,7 +132,9 @@ const CustomWizard = EmberObject.extend({
   },
 
   buildMappedJson(inputs) {
-    if (!inputs || !inputs.length) {return false;}
+    if (!inputs || !inputs.length) {
+      return false;
+    }
 
     let result = [];
 

From 0205d8ccb5aa59a39b66739805029e3d8678b037 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 12 Apr 2021 11:56:22 +0530
Subject: [PATCH 09/17] fixed linting issues for javascripts/wizard folder
 (#94)

* ran eslint and fixes linting issues for javascripts/wizard folder

* ran prettier
---
 assets/javascripts/wizard-custom-globals.js   |  3 ++-
 assets/javascripts/wizard-custom-guest.js     |  4 ++--
 assets/javascripts/wizard-custom-start.js     |  2 +-
 .../components/custom-user-selector.js.es6    | 19 +++++++++++-------
 .../wizard/components/field-validators.js.es6 |  1 -
 .../similar-topics-validator.js.es6           | 17 +++++++++-------
 .../components/wizard-composer-editor.js.es6  | 20 ++++++++-----------
 .../components/wizard-field-category.js.es6   |  4 +++-
 .../wizard/components/wizard-no-access.js.es6 |  1 +
 .../components/wizard-similar-topics.js.es6   |  4 +++-
 .../components/wizard-text-field.js.es6       |  4 ++--
 .../wizard/helpers/char-counter.js.es6        |  5 +++--
 .../wizard/helpers/date-node.js.es6           |  3 ++-
 .../wizard/helpers/dir-span.js.es6            |  1 +
 .../wizard/helpers/loading-spinner.es6        | 10 ++++++----
 .../wizard/helpers/plugin-outlet.js.es6       |  3 ++-
 .../initializers/custom-wizard-field.js.es6   | 10 +++++++---
 .../initializers/custom-wizard-step.js.es6    | 12 +++++++----
 .../wizard/initializers/custom-wizard.js.es6  | 16 ++++++++-------
 .../javascripts/wizard/lib/text-lite.js.es6   |  1 +
 .../javascripts/wizard/lib/user-search.js.es6 | 15 +++++++-------
 .../javascripts/wizard/lib/wizard-i18n.js.es6 |  4 +++-
 .../javascripts/wizard/models/custom.js.es6   | 14 +++++++++----
 .../wizard/routes/custom-step.js.es6          |  4 +++-
 .../javascripts/wizard/routes/custom.js.es6   |  2 +-
 25 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/assets/javascripts/wizard-custom-globals.js b/assets/javascripts/wizard-custom-globals.js
index e37648e5..9510184b 100644
--- a/assets/javascripts/wizard-custom-globals.js
+++ b/assets/javascripts/wizard-custom-globals.js
@@ -1,4 +1,5 @@
-window.Discourse = {}
+/* eslint no-undef: 0*/
+window.Discourse = {};
 window.Wizard = {};
 Wizard.SiteSettings = {};
 Discourse.__widget_helpers = {};
diff --git a/assets/javascripts/wizard-custom-guest.js b/assets/javascripts/wizard-custom-guest.js
index dc2f6430..1e77ef88 100644
--- a/assets/javascripts/wizard-custom-guest.js
+++ b/assets/javascripts/wizard-custom-guest.js
@@ -1,4 +1,4 @@
 (function () {
   document.cookie = 'destination_url=' + window.location.href + ';path=/';
-  window.location.href = '/login'
-})()
+  window.location.href = '/login';
+})();
diff --git a/assets/javascripts/wizard-custom-start.js b/assets/javascripts/wizard-custom-start.js
index 99937b5f..0c62404c 100644
--- a/assets/javascripts/wizard-custom-start.js
+++ b/assets/javascripts/wizard-custom-start.js
@@ -1,4 +1,4 @@
 (function() {
-  var wizard = require('discourse/plugins/discourse-custom-wizard/wizard/custom-wizard').default.create();
+  let wizard = require('discourse/plugins/discourse-custom-wizard/wizard/custom-wizard').default.create();
   wizard.start();
 })();
diff --git a/assets/javascripts/wizard/components/custom-user-selector.js.es6 b/assets/javascripts/wizard/components/custom-user-selector.js.es6
index ee88645c..b2f08ede 100644
--- a/assets/javascripts/wizard/components/custom-user-selector.js.es6
+++ b/assets/javascripts/wizard/components/custom-user-selector.js.es6
@@ -5,6 +5,8 @@ import {
 import { renderAvatar } from "discourse/helpers/user-avatar";
 import userSearch from "../lib/user-search";
 import WizardI18n from "../lib/wizard-i18n";
+import Handlebars from "handlebars";
+import { isEmpty } from "@ember/utils";
 
 const template = function (params) {
   const options = params.options;
@@ -43,13 +45,14 @@ export default Ember.TextField.extend({
 
   @observes("usernames")
   _update() {
-    if (this.get("canReceiveUpdates") === "true")
+    if (this.get("canReceiveUpdates") === "true") {
       this.didInsertElement({ updateData: true });
+    }
   },
 
   didInsertElement(opts) {
     this._super();
-    var self = this,
+    let self = this,
       selected = [],
       groups = [],
       currentUser = this.currentUser,
@@ -82,7 +85,7 @@ export default Ember.TextField.extend({
         dataSource(term) {
           const termRegex = /[^a-zA-Z0-9_\-\.@\+]/;
 
-          var results = userSearch({
+          let results = userSearch({
             term: term.replace(termRegex, ""),
             topicId: self.get("topicId"),
             exclude: excludedUsernames(),
@@ -102,7 +105,7 @@ export default Ember.TextField.extend({
             }
             return v.username || v.name;
           } else {
-            var excludes = excludedUsernames();
+            let excludes = excludedUsernames();
             return v.usernames.filter(function (item) {
               return excludes.indexOf(item) === -1;
             });
@@ -110,7 +113,7 @@ export default Ember.TextField.extend({
         },
 
         onChangeItems(items) {
-          var hasGroups = false;
+          let hasGroups = false;
           items = items.map(function (i) {
             if (groups.indexOf(i) > -1) {
               hasGroups = true;
@@ -121,7 +124,9 @@ export default Ember.TextField.extend({
           self.set("hasGroups", hasGroups);
 
           selected = items;
-          if (self.get("onChangeCallback")) self.sendAction("onChangeCallback");
+          if (self.get("onChangeCallback")) {
+            self.sendAction("onChangeCallback");
+          }
         },
 
         reverseTransform(i) {
@@ -139,7 +144,7 @@ export default Ember.TextField.extend({
   @observes("usernames")
   _clearInput: function () {
     if (arguments.length > 1) {
-      if (Em.isEmpty(this.get("usernames"))) {
+      if (isEmpty(this.get("usernames"))) {
         $(this.element).parent().find("a").click();
       }
     }
diff --git a/assets/javascripts/wizard/components/field-validators.js.es6 b/assets/javascripts/wizard/components/field-validators.js.es6
index 85811076..a315020d 100644
--- a/assets/javascripts/wizard/components/field-validators.js.es6
+++ b/assets/javascripts/wizard/components/field-validators.js.es6
@@ -1,5 +1,4 @@
 import Component from "@ember/component";
-import { observes } from "discourse-common/utils/decorators";
 export default Component.extend({
   actions: {
     perform() {
diff --git a/assets/javascripts/wizard/components/similar-topics-validator.js.es6 b/assets/javascripts/wizard/components/similar-topics-validator.js.es6
index 17c8964a..98ea9270 100644
--- a/assets/javascripts/wizard/components/similar-topics-validator.js.es6
+++ b/assets/javascripts/wizard/components/similar-topics-validator.js.es6
@@ -1,11 +1,10 @@
 import WizardFieldValidator from "../../wizard/components/validator";
 import { deepMerge } from "discourse-common/lib/object";
-import { observes } from "discourse-common/utils/decorators";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { cancel, later } from "@ember/runloop";
 import { A } from "@ember/array";
 import EmberObject, { computed } from "@ember/object";
-import { notEmpty, and, equal, empty } from "@ember/object/computed";
-import discourseComputed from "discourse-common/utils/decorators";
+import { and, equal, notEmpty } from "@ember/object/computed";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 import { dasherize } from "@ember/string";
 
@@ -16,7 +15,7 @@ export default WizardFieldValidator.extend({
   hasSimilarTopics: notEmpty("similarTopics"),
   hasNotSearched: equal("similarTopics", null),
   noSimilarTopics: computed("similarTopics", function () {
-    return this.similarTopics !== null && this.similarTopics.length == 0;
+    return this.similarTopics !== null && this.similarTopics.length === 0;
   }),
   showSimilarTopics: computed("typing", "hasSimilarTopics", function () {
     return this.hasSimilarTopics && !this.typing;
@@ -35,8 +34,9 @@ export default WizardFieldValidator.extend({
 
   @discourseComputed("validation.categories")
   validationCategories(categoryIds) {
-    if (categoryIds)
+    if (categoryIds) {
       return categoryIds.map((id) => this.site.categoriesById[id]);
+    }
 
     return A();
   },
@@ -78,15 +78,18 @@ export default WizardFieldValidator.extend({
 
   @discourseComputed("currentState")
   currentStateClass(currentState) {
-    if (currentState) return `similar-topics-${dasherize(currentState)}`;
+    if (currentState) {
+      return `similar-topics-${dasherize(currentState)}`;
+    }
 
     return "similar-topics";
   },
 
   @discourseComputed("currentState")
   currentStateKey(currentState) {
-    if (currentState)
+    if (currentState) {
       return `realtime_validations.similar_topics.${currentState}`;
+    }
 
     return false;
   },
diff --git a/assets/javascripts/wizard/components/wizard-composer-editor.js.es6 b/assets/javascripts/wizard/components/wizard-composer-editor.js.es6
index 5e7fc5fe..2a92f12a 100644
--- a/assets/javascripts/wizard/components/wizard-composer-editor.js.es6
+++ b/assets/javascripts/wizard/components/wizard-composer-editor.js.es6
@@ -4,22 +4,18 @@ import {
   on,
 } from "discourse-common/utils/decorators";
 import { findRawTemplate } from "discourse-common/lib/raw-templates";
-import { throttle } from "@ember/runloop";
-import { scheduleOnce, next } from "@ember/runloop";
-import {
-  safariHacksDisabled,
-  caretPosition,
-  inCodeBlock,
-} from "discourse/lib/utilities";
+import { next, scheduleOnce, throttle } from "@ember/runloop";
+import { caretPosition, inCodeBlock } from "discourse/lib/utilities";
 import highlightSyntax from "discourse/lib/highlight-syntax";
 import { getToken } from "wizard/lib/ajax";
 import {
-  validateUploadedFiles,
+  displayErrorForUpload,
   getUploadMarkdown,
+  uploadIcon,
+  validateUploadedFiles,
 } from "discourse/lib/uploads";
 import { cacheShortUploadUrl } from "pretty-text/upload-short-url";
 import { alias } from "@ember/object/computed";
-import { uploadIcon } from "discourse/lib/uploads";
 import WizardI18n from "../lib/wizard-i18n";
 
 const uploadMarkdownResolvers = [];
@@ -78,8 +74,8 @@ export default ComposerEditor.extend({
       .join(",");
   },
 
-  @discourseComputed("currentUser")
-  uploadIcon(currentUser) {
+  @discourseComputed()
+  uploadIcon() {
     return uploadIcon(false, this.siteSettings);
   },
 
@@ -295,7 +291,7 @@ export default ComposerEditor.extend({
         shortcut: "K",
         trimLeading: true,
         unshift: true,
-        sendAction: (event) => component.set("showHyperlinkBox", true),
+        sendAction: () => component.set("showHyperlinkBox", true),
       });
     },
 
diff --git a/assets/javascripts/wizard/components/wizard-field-category.js.es6 b/assets/javascripts/wizard/components/wizard-field-category.js.es6
index 913742d5..a7452214 100644
--- a/assets/javascripts/wizard/components/wizard-field-category.js.es6
+++ b/assets/javascripts/wizard/components/wizard-field-category.js.es6
@@ -12,7 +12,9 @@ export default Ember.Component.extend({
         [...value].reduce((result, v) => {
           let val =
             property === "id" ? Category.findById(v) : Category.findBySlug(v);
-          if (val) result.push(val);
+          if (val) {
+            result.push(val);
+          }
           return result;
         }, [])
       );
diff --git a/assets/javascripts/wizard/components/wizard-no-access.js.es6 b/assets/javascripts/wizard/components/wizard-no-access.js.es6
index c0edb58a..57fe9111 100644
--- a/assets/javascripts/wizard/components/wizard-no-access.js.es6
+++ b/assets/javascripts/wizard/components/wizard-no-access.js.es6
@@ -2,6 +2,7 @@ import CustomWizard from "../models/custom";
 
 export default Ember.Component.extend({
   siteName: function () {
+    /*eslint no-undef:0*/
     return Wizard.SiteSettings.title;
   }.property(),
 
diff --git a/assets/javascripts/wizard/components/wizard-similar-topics.js.es6 b/assets/javascripts/wizard/components/wizard-similar-topics.js.es6
index 74b1e358..687cfa86 100644
--- a/assets/javascripts/wizard/components/wizard-similar-topics.js.es6
+++ b/assets/javascripts/wizard/components/wizard-similar-topics.js.es6
@@ -15,7 +15,9 @@ export default Component.extend({
   },
 
   documentClick(e) {
-    if (this._state == "destroying") return;
+    if (this._state === "destroying") {
+      return;
+    }
     let $target = $(e.target);
 
     if (!$target.hasClass("show-topics")) {
diff --git a/assets/javascripts/wizard/components/wizard-text-field.js.es6 b/assets/javascripts/wizard/components/wizard-text-field.js.es6
index 187deea9..c522eb2c 100644
--- a/assets/javascripts/wizard/components/wizard-text-field.js.es6
+++ b/assets/javascripts/wizard/components/wizard-text-field.js.es6
@@ -1,7 +1,7 @@
-/* eslint no-undef: 0 */
+/* eslint no-undef: 0*/
 
 import computed from "discourse-common/utils/decorators";
-import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
+import { isLTR, isRTL, siteDir } from "discourse/lib/text-direction";
 import WizardI18n from "../lib/wizard-i18n";
 
 export default Ember.TextField.extend({
diff --git a/assets/javascripts/wizard/helpers/char-counter.js.es6 b/assets/javascripts/wizard/helpers/char-counter.js.es6
index b666d0bf..a700a432 100644
--- a/assets/javascripts/wizard/helpers/char-counter.js.es6
+++ b/assets/javascripts/wizard/helpers/char-counter.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
 import I18n from "I18n";
+import Handlebars from "handlebars";
 
 export default registerUnbound("char-counter", function (body, maxLength) {
   let bodyLength = body ? body.length : 0;
@@ -9,11 +10,11 @@ export default registerUnbound("char-counter", function (body, 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) }
+      { count: parseInt(maxLength, 10) }
     )}</div>`;
   } else {
     finalString = `<div class="body-length">${I18n.t("wizard.x_characters", {
-      count: parseInt(bodyLength),
+      count: parseInt(bodyLength, 10),
     })}</div>`;
   }
 
diff --git a/assets/javascripts/wizard/helpers/date-node.js.es6 b/assets/javascripts/wizard/helpers/date-node.js.es6
index 99fa01f3..b7d19d0f 100644
--- a/assets/javascripts/wizard/helpers/date-node.js.es6
+++ b/assets/javascripts/wizard/helpers/date-node.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
-import { longDate, number, relativeAge } from "discourse/lib/formatter";
+import { longDate, relativeAge } from "discourse/lib/formatter";
+import Handlebars from "handlebars";
 
 export default registerUnbound("date-node", function (dt) {
   if (typeof dt === "string") {
diff --git a/assets/javascripts/wizard/helpers/dir-span.js.es6 b/assets/javascripts/wizard/helpers/dir-span.js.es6
index a750720a..45720796 100644
--- a/assets/javascripts/wizard/helpers/dir-span.js.es6
+++ b/assets/javascripts/wizard/helpers/dir-span.js.es6
@@ -1,4 +1,5 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import Handlebars from "handlebars";
 
 export default registerUnbound("dir-span", function (str) {
   return new Handlebars.SafeString(str);
diff --git a/assets/javascripts/wizard/helpers/loading-spinner.es6 b/assets/javascripts/wizard/helpers/loading-spinner.es6
index fda8fe6b..5f15403d 100644
--- a/assets/javascripts/wizard/helpers/loading-spinner.es6
+++ b/assets/javascripts/wizard/helpers/loading-spinner.es6
@@ -1,15 +1,17 @@
-import { htmlHelper } from 'discourse-common/lib/helpers';
+import { htmlHelper } from "discourse-common/lib/helpers";
 
 function renderSpinner(cssClass) {
   var html = "<div class='spinner";
-  if (cssClass) { html += ' ' + cssClass; }
+  if (cssClass) {
+    html += " " + cssClass;
+  }
   return html + "'></div>";
 }
 var spinnerHTML = renderSpinner();
 
-export default htmlHelper(params => {
+export default htmlHelper((params) => {
   const hash = params.hash;
-  return renderSpinner((hash && hash.size) ? hash.size : undefined);
+  return renderSpinner(hash && hash.size ? hash.size : undefined);
 });
 
 export { spinnerHTML, renderSpinner };
diff --git a/assets/javascripts/wizard/helpers/plugin-outlet.js.es6 b/assets/javascripts/wizard/helpers/plugin-outlet.js.es6
index adbbd777..e6ff81a6 100644
--- a/assets/javascripts/wizard/helpers/plugin-outlet.js.es6
+++ b/assets/javascripts/wizard/helpers/plugin-outlet.js.es6
@@ -1,5 +1,6 @@
 import { registerUnbound } from "discourse-common/lib/helpers";
+import Handlebars from "handlebars";
 
-export default registerUnbound("plugin-outlet", function (attrs) {
+export default registerUnbound("plugin-outlet", function () {
   return new Handlebars.SafeString("");
 });
diff --git a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
index 9d90d3fc..3ede2b05 100644
--- a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
+++ b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6
@@ -3,8 +3,10 @@ import discourseComputed from "discourse-common/utils/decorators";
 
 export default {
   name: "custom-wizard-field",
-  initialize(app) {
-    if (window.location.pathname.indexOf("/w/") < 0) return;
+  initialize() {
+    if (window.location.pathname.indexOf("/w/") < 0) {
+      return;
+    }
 
     const FieldComponent = requirejs("wizard/components/wizard-field").default;
     const FieldModel = requirejs("wizard/models/wizard-field").default;
@@ -30,7 +32,9 @@ export default {
       inputComponentName: function () {
         const type = this.get("field.type");
         const id = this.get("field.id");
-        if (["text_only"].includes(type)) return false;
+        if (["text_only"].includes(type)) {
+          return false;
+        }
         return dasherize(type === "component" ? id : `wizard-field-${type}`);
       }.property("field.type", "field.id"),
     });
diff --git a/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
index 58137e7a..18fa9c70 100644
--- a/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
+++ b/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
@@ -1,7 +1,9 @@
 export default {
   name: "custom-wizard-step",
-  initialize(app) {
-    if (window.location.pathname.indexOf("/w/") < 0) return;
+  initialize() {
+    if (window.location.pathname.indexOf("/w/") < 0) {
+      return;
+    }
 
     const CustomWizard = requirejs(
       "discourse/plugins/discourse-custom-wizard/wizard/models/custom"
@@ -132,7 +134,9 @@ export default {
 
       bannerImage: function () {
         const src = this.get("step.banner");
-        if (!src) return;
+        if (!src) {
+          return;
+        }
         return getUrl(src);
       }.property("step.banner"),
 
@@ -166,7 +170,7 @@ export default {
           .finally(() => this.set("saving", false));
       },
 
-      keyPress(key) {},
+      keyPress() {},
 
       actions: {
         quit() {
diff --git a/assets/javascripts/wizard/initializers/custom-wizard.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard.js.es6
index 531f9475..ab7c9146 100644
--- a/assets/javascripts/wizard/initializers/custom-wizard.js.es6
+++ b/assets/javascripts/wizard/initializers/custom-wizard.js.es6
@@ -1,14 +1,13 @@
 export default {
   name: "custom-routes",
   initialize(app) {
-    if (window.location.pathname.indexOf("/w/") < 0) return;
+    if (window.location.pathname.indexOf("/w/") < 0) {
+      return;
+    }
 
     const EmberObject = requirejs("@ember/object").default;
     const Router = requirejs("wizard/router").default;
     const ApplicationRoute = requirejs("wizard/routes/application").default;
-    const CustomWizard = requirejs(
-      "discourse/plugins/discourse-custom-wizard/wizard/models/custom"
-    ).default;
     const getUrl = requirejs("discourse-common/lib/get-url").default;
     const Store = requirejs("discourse/models/store").default;
     const registerRawHelpers = requirejs(
@@ -18,6 +17,7 @@ export default {
       .createHelperContext;
     const RawHandlebars = requirejs("discourse-common/lib/raw-handlebars")
       .default;
+    const Handlebars = requirejs("handlebars").default;
     const Site = requirejs(
       "discourse/plugins/discourse-custom-wizard/wizard/models/site"
     ).default;
@@ -36,10 +36,12 @@ export default {
     // IE11 Polyfill - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#Polyfill
     if (!Object.entries) {
       Object.entries = function (obj) {
-        var ownProps = Object.keys(obj),
+        let ownProps = Object.keys(obj),
           i = ownProps.length,
           resArray = new Array(i); // preallocate the Array
-        while (i--) resArray[i] = [ownProps[i], obj[ownProps[i]]];
+        while (i--) {
+          resArray[i] = [ownProps[i], obj[ownProps[i]]];
+        }
 
         return resArray;
       };
@@ -53,7 +55,7 @@ export default {
     });
 
     const targets = ["controller", "component", "route", "model", "adapter"];
-
+    /*eslint no-undef: 0*/
     const siteSettings = Wizard.SiteSettings;
     app.register("site-settings:main", siteSettings, { instantiate: false });
     createHelperContext({ siteSettings });
diff --git a/assets/javascripts/wizard/lib/text-lite.js.es6 b/assets/javascripts/wizard/lib/text-lite.js.es6
index 72745e5a..4f9064a5 100644
--- a/assets/javascripts/wizard/lib/text-lite.js.es6
+++ b/assets/javascripts/wizard/lib/text-lite.js.es6
@@ -1,5 +1,6 @@
 import loadScript from "./load-script";
 import { default as PrettyText } from "pretty-text/pretty-text";
+import Handlebars from "handlebars";
 
 export function cook(text, options) {
   return new Handlebars.SafeString(new PrettyText(options).cook(text));
diff --git a/assets/javascripts/wizard/lib/user-search.js.es6 b/assets/javascripts/wizard/lib/user-search.js.es6
index eb832e04..8ef96266 100644
--- a/assets/javascripts/wizard/lib/user-search.js.es6
+++ b/assets/javascripts/wizard/lib/user-search.js.es6
@@ -2,7 +2,7 @@ import { CANCELLED_STATUS } from "discourse/lib/autocomplete";
 import { debounce } from "@ember/runloop";
 import getUrl from "discourse-common/lib/get-url";
 
-var cache = {},
+let cache = {},
   cacheTopicId,
   cacheTime,
   currentTerm,
@@ -18,7 +18,7 @@ function performSearch(
   group,
   resultsFn
 ) {
-  var cached = cache[term];
+  let cached = cache[term];
   if (cached) {
     resultsFn(cached);
     return;
@@ -37,7 +37,7 @@ function performSearch(
     },
   });
 
-  var returnVal = CANCELLED_STATUS;
+  let returnVal = CANCELLED_STATUS;
 
   oldSearch
     .then(function (r) {
@@ -59,7 +59,7 @@ function organizeResults(r, options) {
     return r;
   }
 
-  var exclude = options.exclude || [],
+  let exclude = options.exclude || [],
     limit = options.limit || 5,
     users = [],
     emails = [],
@@ -87,8 +87,9 @@ function organizeResults(r, options) {
       if (
         results.length > limit &&
         options.term.toLowerCase() !== g.name.toLowerCase()
-      )
+      ) {
         return false;
+      }
       if (exclude.indexOf(g.name) === -1) {
         groups.push(g);
         results.push(g);
@@ -104,7 +105,7 @@ function organizeResults(r, options) {
 }
 
 export default function userSearch(options) {
-  var term = options.term || "",
+  let term = options.term || "",
     includeGroups = options.includeGroups,
     includeMentionableGroups = options.includeMentionableGroups,
     includeMessageableGroups = options.includeMessageableGroups,
@@ -131,7 +132,7 @@ export default function userSearch(options) {
 
     cacheTopicId = topicId;
 
-    var clearPromise = setTimeout(function () {
+    let clearPromise = setTimeout(function () {
       resolve(CANCELLED_STATUS);
     }, 5000);
 
diff --git a/assets/javascripts/wizard/lib/wizard-i18n.js.es6 b/assets/javascripts/wizard/lib/wizard-i18n.js.es6
index 2b492338..17242e58 100644
--- a/assets/javascripts/wizard/lib/wizard-i18n.js.es6
+++ b/assets/javascripts/wizard/lib/wizard-i18n.js.es6
@@ -19,7 +19,9 @@ const translationExists = (key) => {
 
 const WizardI18n = (key, params = {}) => {
   const themeId = getThemeId();
-  if (!themeId) return I18n.t(key, params);
+  if (!themeId) {
+    return I18n.t(key, params);
+  }
 
   const themeKey = `theme_translations.${themeId}.${key}`;
 
diff --git a/assets/javascripts/wizard/models/custom.js.es6 b/assets/javascripts/wizard/models/custom.js.es6
index b2918ad7..4e214eed 100644
--- a/assets/javascripts/wizard/models/custom.js.es6
+++ b/assets/javascripts/wizard/models/custom.js.es6
@@ -10,7 +10,9 @@ const CustomWizard = EmberObject.extend({
   totalSteps: (length) => length,
 
   skip() {
-    if (this.required && !this.completed && this.permitted) return;
+    if (this.required && !this.completed && this.permitted) {
+      return;
+    }
     CustomWizard.skip(this.id);
   },
 });
@@ -35,7 +37,9 @@ export function findCustomWizard(wizardId, params = {}) {
   let url = `/w/${wizardId}`;
 
   let paramKeys = Object.keys(params).filter((k) => {
-    if (k === "wizard_id") return false;
+    if (k === "wizard_id") {
+      return false;
+    }
     return !!params[k];
   });
 
@@ -51,7 +55,9 @@ export function findCustomWizard(wizardId, params = {}) {
 
   return ajax({ url, cache: false, dataType: "json" }).then((result) => {
     const wizard = result;
-    if (!wizard) return null;
+    if (!wizard) {
+      return null;
+    }
 
     if (!wizard.completed) {
       wizard.steps = wizard.steps.map((step) => {
@@ -62,7 +68,7 @@ export function findCustomWizard(wizardId, params = {}) {
         });
 
         let tabindex = 1;
-        stepObj.fields.forEach((f, i) => {
+        stepObj.fields.forEach((f) => {
           f.tabindex = tabindex;
 
           if (["date_time"].includes(f.type)) {
diff --git a/assets/javascripts/wizard/routes/custom-step.js.es6 b/assets/javascripts/wizard/routes/custom-step.js.es6
index 5fc15529..3cb5db6e 100644
--- a/assets/javascripts/wizard/routes/custom-step.js.es6
+++ b/assets/javascripts/wizard/routes/custom-step.js.es6
@@ -13,7 +13,9 @@ export default Ember.Route.extend({
   },
 
   afterModel(model) {
-    if (model.completed) return this.transitionTo("index");
+    if (model.completed) {
+      return this.transitionTo("index");
+    }
     return model.set("wizardId", this.modelFor("custom").id);
   },
 
diff --git a/assets/javascripts/wizard/routes/custom.js.es6 b/assets/javascripts/wizard/routes/custom.js.es6
index e2e52ec7..041ea967 100644
--- a/assets/javascripts/wizard/routes/custom.js.es6
+++ b/assets/javascripts/wizard/routes/custom.js.es6
@@ -1,4 +1,4 @@
-/* eslint no-undef: 0 */
+/* eslint no-undef: 0*/
 
 import { findCustomWizard } from "../models/custom";
 import { ajax } from "wizard/lib/ajax";

From 2788e8026ede53d6df17f62ce1877c2ba6894735 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 12 Apr 2021 12:05:15 +0530
Subject: [PATCH 10/17] ran prettier on stylesheets and global wizard
 javascripts (#95)

---
 assets/javascripts/wizard-custom-globals.js   |   2 +-
 assets/javascripts/wizard-custom-guest.js     |   4 +-
 assets/javascripts/wizard-custom-start.js     |   4 +-
 assets/stylesheets/common/wizard-admin.scss   | 188 ++++----
 assets/stylesheets/common/wizard-api.scss     |  18 +-
 assets/stylesheets/common/wizard-manager.scss |  16 +-
 assets/stylesheets/common/wizard-mapper.scss  |  68 +--
 .../wizard/custom/autocomplete.scss           |  14 +-
 assets/stylesheets/wizard/custom/badges.scss  |  24 +-
 assets/stylesheets/wizard/custom/base.scss    |   2 +-
 .../stylesheets/wizard/custom/composer.scss   |  15 +-
 assets/stylesheets/wizard/custom/events.scss  | 420 +++++++++---------
 assets/stylesheets/wizard/custom/field.scss   |  25 +-
 .../stylesheets/wizard/custom/locations.scss  |  13 +-
 assets/stylesheets/wizard/custom/step.scss    |  14 +-
 .../stylesheets/wizard/custom/validators.scss |  12 +-
 assets/stylesheets/wizard/custom/wizard.scss  |  26 +-
 17 files changed, 449 insertions(+), 416 deletions(-)

diff --git a/assets/javascripts/wizard-custom-globals.js b/assets/javascripts/wizard-custom-globals.js
index 9510184b..83923cba 100644
--- a/assets/javascripts/wizard-custom-globals.js
+++ b/assets/javascripts/wizard-custom-globals.js
@@ -3,4 +3,4 @@ window.Discourse = {};
 window.Wizard = {};
 Wizard.SiteSettings = {};
 Discourse.__widget_helpers = {};
-Discourse.SiteSettings = Wizard.SiteSettings;
\ No newline at end of file
+Discourse.SiteSettings = Wizard.SiteSettings;
diff --git a/assets/javascripts/wizard-custom-guest.js b/assets/javascripts/wizard-custom-guest.js
index 1e77ef88..4493cf01 100644
--- a/assets/javascripts/wizard-custom-guest.js
+++ b/assets/javascripts/wizard-custom-guest.js
@@ -1,4 +1,4 @@
 (function () {
-  document.cookie = 'destination_url=' + window.location.href + ';path=/';
-  window.location.href = '/login';
+  document.cookie = "destination_url=" + window.location.href + ";path=/";
+  window.location.href = "/login";
 })();
diff --git a/assets/javascripts/wizard-custom-start.js b/assets/javascripts/wizard-custom-start.js
index 0c62404c..3ffa9c5a 100644
--- a/assets/javascripts/wizard-custom-start.js
+++ b/assets/javascripts/wizard-custom-start.js
@@ -1,4 +1,4 @@
-(function() {
-  let wizard = require('discourse/plugins/discourse-custom-wizard/wizard/custom-wizard').default.create();
+(function () {
+  let wizard = require("discourse/plugins/discourse-custom-wizard/wizard/custom-wizard").default.create();
   wizard.start();
 })();
diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/wizard-admin.scss
index 6b5ad58f..d7d00795 100644
--- a/assets/stylesheets/common/wizard-admin.scss
+++ b/assets/stylesheets/common/wizard-admin.scss
@@ -1,15 +1,15 @@
-@import 'wizard-mapper';
-@import 'wizard-manager';
-@import 'wizard-api';
-@import 'common/components/buttons';
+@import "wizard-mapper";
+@import "wizard-manager";
+@import "wizard-api";
+@import "common/components/buttons";
 
 .admin-wizard-controls {
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: 20px;
-  
-  &+ .wizard-message + div {
+
+  & + .wizard-message + div {
     margin-top: 20px;
   }
 }
@@ -22,54 +22,52 @@
   display: flex;
   justify-content: space-between;
   align-items: flex-start;
-  
+
   .message-block {
     .d-icon {
       margin-right: 4px;
     }
-    
+
     .d-icon-check-circle {
       color: var(--success);
     }
-    
+
     .d-icon-times-circle {
       color: var(--danger);
     }
-    
+
     a + a {
       border-left: 1px solid $primary-medium;
       padding-left: 5px;
       margin-left: 5px;
     }
-    
+
     .message {
       white-space: nowrap;
     }
-    
+
     .list-colon {
       margin-right: 5px;
     }
-    
+
     ul {
       list-style: none;
       margin: 0;
-      
+
       span.action {
         margin-left: 5px;
       }
     }
   }
-  
+
   & + div {
     margin-top: 30px;
   }
-  
-  
 }
 
 .wizard-submissions {
   overflow: scroll;
-  
+
   table td {
     min-width: 150px;
   }
@@ -81,7 +79,7 @@
       margin: 0 7px;
     }
   }
-  
+
   .wizard-logs {
     .date {
       width: 100px;
@@ -125,11 +123,11 @@
 .wizard-custom-action {
   position: relative;
   display: none;
-  
+
   &.visible {
     display: flex;
   }
-  
+
   .undo-changes {
     position: absolute;
     top: 0;
@@ -139,11 +137,11 @@
 
 .admin-wizard-container.settings .wizard-basic-details {
   justify-content: initial;
-  
+
   .setting {
     width: auto;
     margin-right: 20px;
-    
+
     .setting-label {
       width: initial;
       min-width: initial;
@@ -153,7 +151,7 @@
 
 .wizard-header {
   margin-bottom: 20px;
-  
+
   &.large {
     font-size: 1.5em;
     min-height: 31px;
@@ -161,32 +159,32 @@
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
-    
+
     input {
       margin-bottom: 0;
       width: 400px;
     }
-    
+
     label {
       margin-bottom: 0;
     }
-    
+
     .download-link {
       font-size: 1rem;
       line-height: 20px;
     }
-    
+
     .wizard-url {
       display: inline-flex;
       margin-left: 20px;
       max-width: 50%;
-      
+
       a {
         padding: 6px 12px;
         font-size: 1rem;
         background-color: $primary-low;
       }
-      
+
       button {
         font-size: 1rem;
       }
@@ -210,22 +208,21 @@
 .admin-wizard-buttons {
   margin-top: 20px;
   display: flex;
-  
+
   .btn {
     margin-right: 1em;
   }
 }
 
 .admin-wizard-container.settings {
-  
-  [class~='setting'] {
+  [class~="setting"] {
     display: inline-flex;
     align-items: flex-start;
     width: 48%;
     margin-bottom: 30px;
     padding-bottom: 0;
     position: relative;
-    
+
     &:last-of-type {
       margin-bottom: 0;
     }
@@ -241,7 +238,7 @@
       float: initial;
       width: initial;
       padding: 0;
-    
+
       label {
         font-size: 0.85em;
       }
@@ -253,97 +250,100 @@
       button {
         display: block;
       }
-      
-      input[type="text"], textarea {
+
+      input[type="text"],
+      textarea {
         width: 100%;
         box-sizing: border-box;
         margin-bottom: 0;
       }
-      
+
       input[type="number"] {
         margin-bottom: 0;
       }
-      
+
       input[disabled] {
         background-color: $primary-low;
         cursor: not-allowed;
       }
-      
+
       input.medium {
         width: 200px;
       }
-      
+
       input.small {
         width: 100px;
       }
-      
+
       .uploaded-image-preview {
         width: 100%;
         max-height: 100px;
         margin-bottom: 0;
       }
-      
+
       .image-upload-controls {
         label {
           font-size: 1em;
           margin: 0 5px 0 0;
         }
       }
-      
+
       > textarea {
         min-height: 100px;
         resize: vertical;
       }
-      
+
       input[type="checkbox"] {
         float: left;
         margin: 5px 7px 0 0;
       }
-      
-      .input .select-kit, > .select-kit {
+
+      .input .select-kit,
+      > .select-kit {
         max-width: 250px !important;
         min-width: 250px !important;
       }
     }
 
-    &.full, &.full-inline {
+    &.full,
+    &.full-inline {
       width: 100%;
 
       .setting-value {
         width: initial;
         float: none;
-        
+
         &.editor {
           .d-editor {
             margin-bottom: 5px;
           }
         }
-        
+
         .uploaded-image-preview {
           max-height: 200px;
         }
       }
     }
-    
+
     &.full-inline {
       .setting-value {
         display: flex;
         align-items: center;
-        
+
         input {
           margin: 0 7px 0 0;
         }
-        
+
         button {
           margin: 0 0 0 20px;
         }
       }
     }
-    
+
     &.field-mapper-setting {
       .setting-value {
         max-width: calc(100% - 80px);
-        
+
         .mapper-input {
           max-width: 100%;
           box-sizing: border-box;
@@ -359,17 +359,17 @@
       margin-top: 5px;
     }
   }
-  
+
   .advanced-settings {
     width: 100%;
     margin-top: 30px;
-    
-    [class~='setting']:first-of-type {
+
+    [class~="setting"]:first-of-type {
       border-top: none;
     }
   }
-  
-  .wizard-custom-action > [class~='setting']:first-of-type {
+
+  .wizard-custom-action > [class~="setting"]:first-of-type {
     margin-bottom: 0;
   }
 
@@ -406,20 +406,20 @@
     .d-editor-input {
       min-height: 150px;
     }
-    
+
     .d-editor-container {
       display: block;
     }
-    
+
     .d-editor-textarea-wrapper {
       display: grid;
       margin-bottom: 10px;
-      
+
       textarea {
         resize: vertical;
       }
     }
-    
+
     .d-editor-preview-wrapper {
       display: none;
       margin: 0 0 10px 0;
@@ -427,7 +427,7 @@
       background-color: $secondary;
       border: 1px solid $primary-medium;
       max-width: 100%;
-      
+
       &.force-preview {
         display: block;
       }
@@ -437,25 +437,25 @@
       margin: 0;
     }
   }
-  
+
   .wizard-editor-gutter {
     position: relative;
     display: flex;
-    
+
     .btn {
       margin-right: 10px;
       color: $primary;
-      
+
       &:hover {
         color: $secondary;
       }
     }
-    
+
     .wizard-editor-gutter-popover {
       position: absolute;
       padding: 10px;
       background-color: $secondary;
-      box-shadow: shadow('card');
+      box-shadow: shadow("card");
       z-index: 200;
       top: 40px;
     }
@@ -481,7 +481,7 @@
       margin-bottom: 10px;
       margin-right: 10px;
     }
-    
+
     .btn {
       height: 32px;
     }
@@ -505,11 +505,11 @@
 .required-data-message {
   display: inline-block;
   margin-top: 20px;
-  
+
   .label {
     margin-bottom: 5px;
   }
-  
+
   input {
     margin-bottom: 0;
   }
@@ -522,7 +522,7 @@
 
 .modal .modal-body.next-session-time-modal {
   overflow: visible;
-  
+
   .picker-container {
     position: absolute;
     top: 30px;
@@ -574,7 +574,9 @@
   width: 100%;
 }
 
-.add-mapper-input .btn, .btn-after-time, .wizard-editor-gutter .btn {
+.add-mapper-input .btn,
+.btn-after-time,
+.wizard-editor-gutter .btn {
   background-color: $secondary;
   border: 1px solid $primary-medium;
 }
@@ -584,47 +586,47 @@
     .buttons {
       display: flex;
       align-items: center;
-      
+
       button.btn {
         margin-left: 10px;
       }
-    }  
+    }
   }
-  
+
   .btn.save:enabled {
     @extend .btn-primary;
   }
-  
+
   .btn.destroy {
     @extend .btn-danger;
   }
-  
+
   h3 {
     margin-bottom: 0;
   }
-  
+
   .select-kit {
     width: 150px;
   }
-  
+
   .select-kit.multi-select {
     width: 300px;
-    
+
     .choices .choice,
     .select-kit-filter .filter-input {
       height: 25px;
       min-height: 25px;
     }
   }
-  
+
   input[type="text"] {
     margin: 0;
   }
-  
+
   table {
     td {
       vertical-align: top;
-      
+
       label {
         margin: 0;
         line-height: 30px;
@@ -632,25 +634,25 @@
         margin-right: 10px;
       }
     }
-    
+
     td {
       min-width: 170px;
       width: 170px;
     }
-    
+
     td.multi-select {
       min-width: 300px;
     }
-    
+
     td.input {
       min-width: 210px;
       width: 210px;
     }
-    
+
     td.actions {
       min-width: 100px;
       text-align: right;
-      
+
       button.btn {
         margin-left: 5px !important;
       }
@@ -666,7 +668,7 @@
     background-color: var(--primary-low);
     padding: 1em;
     margin: 0 0 1em 0;
-    
+
     input {
       margin-bottom: 0;
     }
@@ -676,7 +678,7 @@
 .validation-container {
   display: flex;
   padding: 1em 0;
-  
+
   .validation-section {
     width: 250px;
   }
diff --git a/assets/stylesheets/common/wizard-api.scss b/assets/stylesheets/common/wizard-api.scss
index c3e50e55..4fdd0fc2 100644
--- a/assets/stylesheets/common/wizard-api.scss
+++ b/assets/stylesheets/common/wizard-api.scss
@@ -17,7 +17,8 @@
     text-align: right;
     vertical-align: middle;
 
-    > .d-icon, > .spinner {
+    > .d-icon,
+    > .spinner {
       margin-right: 7px;
     }
 
@@ -30,7 +31,7 @@
 
 .wizard-api-header {
   margin-top: 20px;
-  
+
   &.page {
     margin-bottom: 20px;
   }
@@ -103,15 +104,16 @@
 
   .endpoint {
     margin-top: 20px;
-    
-    .top, .bottom {
+
+    .top,
+    .bottom {
       display: flex;
     }
-    
+
     .top {
       margin-bottom: 15px;
     }
-    
+
     .combo-box {
       margin-right: 10px;
       width: 210px;
@@ -138,6 +140,6 @@
   margin-bottom: 20px;
 }
 
-.wizard-step-contents{
+.wizard-step-contents {
   height: unset !important;
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/common/wizard-manager.scss b/assets/stylesheets/common/wizard-manager.scss
index 5437134f..135ddb8c 100644
--- a/assets/stylesheets/common/wizard-manager.scss
+++ b/assets/stylesheets/common/wizard-manager.scss
@@ -1,42 +1,42 @@
 .admin-wizards-manager .admin-wizard-controls {
   display: flex;
   justify-content: flex-start;
-  
+
   h3 {
     margin-bottom: 0;
   }
-  
+
   .buttons {
     display: flex;
     margin-left: auto;
-    
+
     > * {
       margin-left: 10px;
     }
-    
+
     #import-button:enabled,
     #export-button:enabled {
       background-color: $tertiary;
       color: $secondary;
     }
-    
+
     #destroy-button:enabled {
       background-color: $danger;
       color: $secondary;
     }
   }
-  
+
   #file-upload {
     display: none;
   }
-  
+
   .filename {
     padding: 0 10px;
     border: 1px solid $primary;
     display: inline-flex;
     height: 28px;
     line-height: 28px;
-    
+
     a {
       color: $primary;
       margin-right: 5px;
diff --git a/assets/stylesheets/common/wizard-mapper.scss b/assets/stylesheets/common/wizard-mapper.scss
index 018fd419..69e9c88e 100644
--- a/assets/stylesheets/common/wizard-mapper.scss
+++ b/assets/stylesheets/common/wizard-mapper.scss
@@ -1,23 +1,23 @@
 .wizard-mapper {
   width: 100%;
-  
+
   .select-kit {
     min-width: initial;
     width: initial;
-    
+
     .select-kit-header {
       min-height: 30px;
     }
-    
+
     .choices .choice {
       height: 24px;
     }
   }
-  
+
   div.mapper-block:not(:last-of-type) {
     margin-right: 10px;
   }
-  
+
   > .mapper-connector.single {
     width: min-content;
     margin-bottom: 10px;
@@ -26,7 +26,7 @@
   }
 }
 
-[class~='mapper-input'] {
+[class~="mapper-input"] {
   display: flex;
   align-items: flex-start;
   width: min-content;
@@ -48,7 +48,7 @@
     background-color: $primary-low;
     border-color: #ddd;
   }
-  
+
   .output {
     position: relative;
   }
@@ -67,8 +67,9 @@
     font-size: 0.8em;
     border: 2px solid $primary-low;
   }
-  
-  &.association, &.validation {
+
+  &.association,
+  &.validation {
     padding-right: 27px;
   }
 }
@@ -80,12 +81,12 @@
 .mapper-connector {
   width: auto;
   min-width: 40px;
-  
+
   .select-kit .select-kit-header {
     display: flex;
     justify-content: center;
   }
-  
+
   &.single {
     height: 28px;
     background: $secondary;
@@ -94,7 +95,7 @@
     align-items: center;
     justify-content: center;
   }
-  
+
   .connector-single {
     padding: 0 5px;
   }
@@ -105,16 +106,19 @@
   max-width: 250px;
   min-width: 250px;
   position: relative;
-  
-  > input, .select-kit, .ac-wrap, .autocomplete.ac-user {
+
+  > input,
+  .select-kit,
+  .ac-wrap,
+  .autocomplete.ac-user {
     width: 250px !important;
   }
-  
+
   .input {
     width: 100%;
     transition: all 0.1s;
   }
-  
+
   .type-selector {
     position: absolute;
     top: -22px;
@@ -126,24 +130,24 @@
     margin-right: 4px;
     display: flex;
     align-items: center;
-    
+
     &.active {
       color: var(--tertiary);
       text-decoration: underline;
     }
-    
+
     &:last-of-type {
       margin-right: 0;
     }
-    
+
     .type-selector-icon {
       margin-left: 2px;
       font-size: 0.7em;
     }
   }
-  
+
   .selector-types {
-    box-shadow: shadow('dropdown');
+    box-shadow: shadow("dropdown");
     position: absolute;
     display: flex;
     background: $secondary;
@@ -152,19 +156,19 @@
     flex-direction: column;
     border: 1px solid $primary-low;
   }
-  
+
   .value-list .remove-value-btn {
     background: none;
     border: none;
-    
+
     .d-icon {
       color: $primary;
     }
   }
-  
+
   .select-kit-header .selected-name {
     max-width: 85%;
-    
+
     .name {
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -178,30 +182,30 @@
   flex-direction: column;
   align-items: center;
   position: relative;
-  
+
   .add-pair,
   .remove-pair,
   .join-pair {
     font-size: 0.9em;
   }
-  
+
   .add-pair {
     margin-top: 5px;
   }
-  
+
   .remove-pair {
     position: absolute;
     top: 5px;
     right: -20px;
   }
-  
+
   .join-pair {
     position: absolute;
     bottom: -25px;
     left: 50%;
     transform: translateX(-50%);
   }
-  
+
   .mapper-connector {
     min-width: 50px;
   }
@@ -211,8 +215,8 @@
   display: flex;
   align-items: flex-start;
   position: relative;
-  
+
   &:not(:first-of-type) {
     margin-top: 30px;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/autocomplete.scss b/assets/stylesheets/wizard/custom/autocomplete.scss
index 5b2dca84..1b02dfcc 100644
--- a/assets/stylesheets/wizard/custom/autocomplete.scss
+++ b/assets/stylesheets/wizard/custom/autocomplete.scss
@@ -29,7 +29,7 @@ div.ac-wrap {
   input[type="text"] {
     border: 0;
   }
-  
+
   .remove-link {
     margin-left: 4px;
     font-size: $font-down-1;
@@ -38,7 +38,7 @@ div.ac-wrap {
     border-radius: 12px;
     box-sizing: border-box;
     border: 1px solid var(--primary-low);
-    
+
     &:hover {
       background-color: var(--danger-low);
       border: 1px solid var(--danger-medium);
@@ -85,7 +85,7 @@ img.avatar {
         img {
           margin-right: 5px;
         }
-        
+
         span.username {
           color: var(--primary);
           vertical-align: middle;
@@ -129,7 +129,8 @@ img.avatar {
     top: 30px !important;
     box-sizing: border-box;
 
-    li, .no-results {
+    li,
+    .no-results {
       padding: 10px;
     }
 
@@ -151,7 +152,8 @@ img.avatar {
   background-color: var(--secondary);
   display: flex;
 
-  &:hover, &.selected {
+  &:hover,
+  &.selected {
     background-color: var(--tertiary);
     color: white;
 
@@ -169,4 +171,4 @@ img.avatar {
   i {
     margin-right: 5px;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/badges.scss b/assets/stylesheets/wizard/custom/badges.scss
index 1109146d..ca9c0450 100644
--- a/assets/stylesheets/wizard/custom/badges.scss
+++ b/assets/stylesheets/wizard/custom/badges.scss
@@ -9,12 +9,12 @@
   .badge-category {
     display: inline-flex;
     align-items: baseline;
-    
+
     .category-name {
       text-overflow: ellipsis;
       overflow: hidden;
     }
-    
+
     .d-icon {
       margin-right: 3px;
       width: 0.74em;
@@ -25,7 +25,7 @@
 
   &.bullet {
     margin-right: 8px;
-    
+
     span.badge-category {
       color: var(--primary-high);
       overflow: hidden;
@@ -34,7 +34,7 @@
         color: $header-primary;
       }
     }
-    
+
     .badge-category-parent-bg,
     .badge-category-bg {
       flex: 0 0 auto;
@@ -43,7 +43,7 @@
       margin-right: 5px;
       display: inline-block;
     }
-    
+
     .badge-category-parent-bg {
       width: 5px;
       margin-right: 0;
@@ -51,7 +51,7 @@
         width: 5px;
       }
     }
-    
+
     .d-icon {
       color: var(--primary-medium);
     }
@@ -61,11 +61,11 @@
     margin-right: 5px;
     padding: 2px 4px 2px 4px;
     display: inline-flex;
-    
+
     span {
       overflow: hidden;
       text-overflow: ellipsis;
-      
+
       &.badge-category-bg,
       &.badge-category-parent-bg {
         position: absolute;
@@ -77,11 +77,11 @@
 
       &.badge-category-parent-bg {
         width: calc(100% - 5px);
-        
+
         & + .badge-category-bg {
           left: 5px;
           width: calc(100% - 5px);
-          
+
           & + .badge-category {
             margin-left: 5px;
           }
@@ -92,7 +92,7 @@
         position: relative;
       }
     }
-    
+
     + .topic-header-extra {
       padding: 2px 4px 2px 4px;
     }
@@ -127,4 +127,4 @@
     color: var(--primary-high);
     margin-right: 5px;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/base.scss b/assets/stylesheets/wizard/custom/base.scss
index c9f3b120..7aa884e9 100644
--- a/assets/stylesheets/wizard/custom/base.scss
+++ b/assets/stylesheets/wizard/custom/base.scss
@@ -15,7 +15,7 @@ textarea {
   height: auto;
   background-color: var(--secondary);
   border: 1px solid var(--primary-medium);
-  
+
   &:focus {
     border-color: var(--tertiary);
     box-shadow: shadow("focus");
diff --git a/assets/stylesheets/wizard/custom/composer.scss b/assets/stylesheets/wizard/custom/composer.scss
index e61d8dbd..4f5ff442 100644
--- a/assets/stylesheets/wizard/custom/composer.scss
+++ b/assets/stylesheets/wizard/custom/composer.scss
@@ -8,12 +8,12 @@
   position: absolute;
   background-color: black;
   opacity: 0.8;
-  z-index: z("modal","overlay");
+  z-index: z("modal", "overlay");
 }
 
 .d-editor-modals {
   position: absolute;
-  z-index: z("modal","content");
+  z-index: z("modal", "content");
 }
 
 .d-editor {
@@ -171,7 +171,7 @@
     resize: vertical;
     flex: initial;
   }
-  
+
   textarea {
     min-height: calc(200px - 32px);
   }
@@ -205,11 +205,11 @@
 .wizard-composer-hyperlink-contents {
   background-color: $secondary;
   padding: 20px;
-  
+
   h3 {
     margin-top: 0;
   }
-  
+
   .composer-link-url,
   .composer-link-name {
     display: block;
@@ -217,7 +217,8 @@
   }
 }
 
-.hide-hyperlink-box, .add-link {
+.hide-hyperlink-box,
+.add-link {
   display: inline;
 }
 
@@ -231,7 +232,7 @@
 
 .bottom-bar {
   display: flex;
-  justify-content:space-between;
+  justify-content: space-between;
   margin-top: 20px;
   align-items: center;
 }
diff --git a/assets/stylesheets/wizard/custom/events.scss b/assets/stylesheets/wizard/custom/events.scss
index 01a724dd..747b68aa 100644
--- a/assets/stylesheets/wizard/custom/events.scss
+++ b/assets/stylesheets/wizard/custom/events.scss
@@ -3,65 +3,66 @@
 .event-form {
   width: 585px;
   max-width: 80vw;
-  
+
   .control {
     display: inline-flex;
     align-items: flex-start;
     min-height: 30px;
     margin-right: 20px;
-    
+
     > input:first-child {
       margin-top: 10px !important;
     }
-    
+
     > span:first-child {
       margin-top: 5px !important;
     }
-    
+
     > input + span {
       margin-top: 5px;
     }
-    
+
     &:last-of-type {
       margin-right: 0;
     }
-    
+
     input[type="checkbox"] {
       margin: 0 10px 0 0;
     }
-    
+
     input[type="number"] {
       width: 50px;
       margin: 0;
       min-height: 34px;
       border: 1px solid #e9e9e9;
     }
-    
+
     &.full-width {
       flex: 1;
     }
-    
-    .select-kit, .ac-wrap {
+
+    .select-kit,
+    .ac-wrap {
       width: 100% !important;
       max-width: 330px;
     }
-    
+
     .select-kit-body {
       width: 100% !important;
       max-width: 330px;
     }
   }
-  
+
   .event-controls {
     margin-bottom: 20px;
     display: flex;
     align-items: flex-start;
   }
-  
+
   .datetime-controls {
     display: flex;
     margin-bottom: 5px;
-    
+
     .date-time-card {
       width: 270px;
       display: inline-block;
@@ -76,9 +77,18 @@
     .end-card {
       border-left: 1px solid #eee;
       padding-left: 20px;
-      
+
       &.disabled {
-        span, label, .pika-label, .pika-table th, .pika-button, .pika-prev, .pika-next, input, .pika-lendar, .is-selected .pika-button {
+        span,
+        label,
+        .pika-label,
+        .pika-table th,
+        .pika-button,
+        .pika-prev,
+        .pika-next,
+        input,
+        .pika-lendar,
+        .is-selected .pika-button {
           color: var(--primary-low);
           background-image: initial;
           background: initial;
@@ -86,8 +96,9 @@
           cursor: default;
           pointer-events: none;
         }
-        
-        input, .pika-lendar {
+
+        input,
+        .pika-lendar {
           border: 1px solid var(--primary-low) !important;
         }
       }
@@ -122,7 +133,7 @@
           width: 127px;
         }
       }
-      
+
       input {
         padding: 4px 10px;
         font-size: 1em;
@@ -134,7 +145,7 @@
         margin: 10px 0;
       }
     }
-    
+
     #date-container-start,
     #date-container-end {
       height: 250px;
@@ -161,16 +172,15 @@
   }
 
   .rsvp-controls {
-    
     .rsvp-container {
       display: flex;
       flex-flow: wrap;
       margin-top: 10px;
-              
+
       .control span {
         margin-right: 10px;
       }
-      
+
       .full-width {
         align-items: flex-start;
       }
@@ -196,7 +206,7 @@ $pd-title-bg: var(--secondary) !default;
 $pd-picker-bg: var(--secondary) !default;
 $pd-picker-border: var(--primary-low) !default;
 $pd-picker-border-bottom: var(--primary-low) !default;
-$pd-picker-shadow: rgba(0,0,0,.5) !default;
+$pd-picker-shadow: rgba(0, 0, 0, 0.5) !default;
 $pd-th-color: var(--primary) !default;
 $pd-day-color: var(--primary) !default;
 $pd-day-bg: var(--secondary) !default;
@@ -212,289 +222,293 @@ $pd-week-color: var(--primary) !default;
 // Font
 $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 
-
 .pika-single {
-    z-index: 9999;
-    display: block;
-    position: relative;
-    color: $pd-text-color;
-    background: $pd-picker-bg;
-    border: 1px solid $pd-picker-border;
-    border-bottom-color: $pd-picker-border-bottom;
-    font-family: $pd-font-family;
+  z-index: 9999;
+  display: block;
+  position: relative;
+  color: $pd-text-color;
+  background: $pd-picker-bg;
+  border: 1px solid $pd-picker-border;
+  border-bottom-color: $pd-picker-border-bottom;
+  font-family: $pd-font-family;
 
-    &.is-hidden {
-        display: none;
-    }
+  &.is-hidden {
+    display: none;
+  }
 
-    &.is-bound {
-        position: absolute;
-        box-shadow: 0 5px 15px -5px $pd-picker-shadow;
-    }
+  &.is-bound {
+    position: absolute;
+    box-shadow: 0 5px 15px -5px $pd-picker-shadow;
+  }
 }
 
 // clear child float (pika-lendar), using the famous micro clearfix hack
 // http://nicolasgallagher.com/micro-clearfix-hack/
 .pika-single {
-    &:before,
-    &:after {
-        content: " ";
-        display: table;
-    }
+  &:before,
+  &:after {
+    content: " ";
+    display: table;
+  }
 
-    &:after { clear: both }
+  &:after {
+    clear: both;
+  }
 }
 
 .pika-lendar {
-    float: left;
-    width: 240px;
-    margin: 8px;
+  float: left;
+  width: 240px;
+  margin: 8px;
 }
 
 .pika-title {
-    position: relative;
-    text-align: center;
+  position: relative;
+  text-align: center;
 
-    select {
-        cursor: pointer;
-        position: absolute;
-        z-index: 9998;
-        margin: 0;
-        left: 0;
-        top: 5px;
-        filter: alpha(opacity=0);
-        opacity: 0;
-    }
+  select {
+    cursor: pointer;
+    position: absolute;
+    z-index: 9998;
+    margin: 0;
+    left: 0;
+    top: 5px;
+    filter: alpha(opacity=0);
+    opacity: 0;
+  }
 }
 
 .pika-label {
-    display: inline-block;
-    position: relative;
-    z-index: 9999;
-    overflow: hidden;
-    margin: 0;
-    padding: 5px 3px;
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: bold;
-    color: $pd-title-color;
-    background-color: $pd-title-bg;
+  display: inline-block;
+  position: relative;
+  z-index: 9999;
+  overflow: hidden;
+  margin: 0;
+  padding: 5px 3px;
+  font-size: 14px;
+  line-height: 20px;
+  font-weight: bold;
+  color: $pd-title-color;
+  background-color: $pd-title-bg;
 }
 
 .pika-prev,
 .pika-next {
-    display: block;
-    cursor: pointer;
-    position: relative;
-    outline: none;
-    border: 0;
-    padding: 0;
-    width: 20px;
-    height: 30px;
-    text-indent: 20px; // hide text using text-indent trick, using width value (it's enough)
-    white-space: nowrap;
-    overflow: hidden;
-    background-color: transparent;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: 75% 75%;
-    opacity: .5;
-    @if (lightness($secondary) < 50) { // invert the black png if the background is dark
-        filter: invert(1); 
-    } 
+  display: block;
+  cursor: pointer;
+  position: relative;
+  outline: none;
+  border: 0;
+  padding: 0;
+  width: 20px;
+  height: 30px;
+  text-indent: 20px; // hide text using text-indent trick, using width value (it's enough)
+  white-space: nowrap;
+  overflow: hidden;
+  background-color: transparent;
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: 75% 75%;
+  opacity: 0.5;
+  @if (lightness($secondary) < 50) {
+    // invert the black png if the background is dark
+    filter: invert(1);
+  }
 
-    &:hover {
-        opacity: 1;
-    }
+  &:hover {
+    opacity: 1;
+  }
 
-    &.is-disabled {
-        cursor: default;
-        opacity: .2;
-    }
+  &.is-disabled {
+    cursor: default;
+    opacity: 0.2;
+  }
 }
 
 .pika-prev,
 .is-rtl .pika-next {
-    float: left;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg==');
+  float: left;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg==");
 }
 
 .pika-next,
 .is-rtl .pika-prev {
-    float: right;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII=');
+  float: right;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII=");
 }
 
 .pika-select {
-    display: inline-block;
+  display: inline-block;
 }
 
 .pika-table {
-    width: 100%;
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 0;
+  width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+  border: 0;
 
-    th,
-    td {
-        width: 14.285714285714286%;
-        padding: 0;
-    }
+  th,
+  td {
+    width: 14.285714285714286%;
+    padding: 0;
+  }
 
-    th {
-        color: $pd-th-color;
-        font-size: 12px;
-        line-height: 25px;
-        font-weight: bold;
-        text-align: center;
-    }
+  th {
+    color: $pd-th-color;
+    font-size: 12px;
+    line-height: 25px;
+    font-weight: bold;
+    text-align: center;
+  }
 
-    abbr {
-        border-bottom: none;
-        cursor: help;
-    }
+  abbr {
+    border-bottom: none;
+    cursor: help;
+  }
 }
 
 .pika-button {
-    cursor: pointer;
-    display: block;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    outline: none;
-    border: 0;
-    margin: 0;
-    width: 100%;
-    padding: 5px;
-    color: $pd-day-color;
-    font-size: 12px;
-    line-height: 15px;
-    text-align: right;
-    background: $pd-day-bg;
+  cursor: pointer;
+  display: block;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  outline: none;
+  border: 0;
+  margin: 0;
+  width: 100%;
+  padding: 5px;
+  color: $pd-day-color;
+  font-size: 12px;
+  line-height: 15px;
+  text-align: right;
+  background: $pd-day-bg;
 
-    .is-today & {
-        color: $pd-day-today-color;
-        font-weight: bold;
-    }
+  .is-today & {
+    color: $pd-day-today-color;
+    font-weight: bold;
+  }
 
-    .is-selected & {
-        color: $pd-day-selected-color;
-        font-weight: bold;
-        background: $pd-day-selected-bg;
-        box-shadow: inset 0 1px 3px $pd-day-selected-shadow;
-        border-radius: 3px;
-    }
+  .is-selected & {
+    color: $pd-day-selected-color;
+    font-weight: bold;
+    background: $pd-day-selected-bg;
+    box-shadow: inset 0 1px 3px $pd-day-selected-shadow;
+    border-radius: 3px;
+  }
 
-    .is-disabled &,
-    .is-outside-current-month & {
-        pointer-events: none;
-        cursor: default;
-        color: $pd-day-disabled-color;
-        opacity: .3;
-    }
+  .is-disabled &,
+  .is-outside-current-month & {
+    pointer-events: none;
+    cursor: default;
+    color: $pd-day-disabled-color;
+    opacity: 0.3;
+  }
 
-    &:hover {
-        color: $pd-day-hover-color;
-        background: $pd-day-hover-bg;
-        box-shadow: none;
-        border-radius: 3px;
-    }
+  &:hover {
+    color: $pd-day-hover-color;
+    background: $pd-day-hover-bg;
+    box-shadow: none;
+    border-radius: 3px;
+  }
 }
 
 .pika-week {
-    font-size: 11px;
-    color: $pd-week-color;
+  font-size: 11px;
+  color: $pd-week-color;
 }
 
 .is-inrange .pika-button {
-    background: #D5E9F7;
+  background: #d5e9f7;
 }
 
 .is-startrange .pika-button {
-    color: var(--secondary);
-    background: #6CB31D;
-    box-shadow: none;
-    border-radius: 3px;
+  color: var(--secondary);
+  background: #6cb31d;
+  box-shadow: none;
+  border-radius: 3px;
 }
 
 .is-endrange .pika-button {
-    color: var(--secondary);
-    background: var(--tertiary);
-    box-shadow: none;
-    border-radius: 3px;
+  color: var(--secondary);
+  background: var(--tertiary);
+  box-shadow: none;
+  border-radius: 3px;
 }
 
-
 // timepicker
 
 .ui-timepicker-wrapper {
-	overflow-y: auto;
-	max-height: 150px;
-	width: 6.5em;
-	background: #fff;
-	border: 1px solid #ddd;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	outline: none;
-	z-index: 10001;
-	margin: 0;
+  overflow-y: auto;
+  max-height: 150px;
+  width: 6.5em;
+  background: #fff;
+  border: 1px solid #ddd;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  outline: none;
+  z-index: 10001;
+  margin: 0;
 }
 
 .ui-timepicker-wrapper.ui-timepicker-with-duration {
-	width: 13em;
+  width: 13em;
 }
 
 .ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-30,
 .ui-timepicker-wrapper.ui-timepicker-with-duration.ui-timepicker-step-60 {
-	width: 11em;
+  width: 11em;
 }
 
 .ui-timepicker-list {
-	margin: 0;
-	padding: 0;
-	list-style: none;
+  margin: 0;
+  padding: 0;
+  list-style: none;
 }
 
 .ui-timepicker-duration {
-	margin-left: 5px; color: #888;
+  margin-left: 5px;
+  color: #888;
 }
 
 .ui-timepicker-list:hover .ui-timepicker-duration {
-	color: #888;
+  color: #888;
 }
 
 .ui-timepicker-list li {
-	padding: 3px 0 3px 5px;
-	cursor: pointer;
-	white-space: nowrap;
-	color: #000;
-	list-style: none;
-	margin: 0;
+  padding: 3px 0 3px 5px;
+  cursor: pointer;
+  white-space: nowrap;
+  color: #000;
+  list-style: none;
+  margin: 0;
 }
 
 .ui-timepicker-list:hover .ui-timepicker-selected {
-	background: #fff; color: #000;
+  background: #fff;
+  color: #000;
 }
 
 li.ui-timepicker-selected,
 .ui-timepicker-list li:hover,
 .ui-timepicker-list .ui-timepicker-selected:hover {
-	background: #1980EC; color: #fff;
+  background: #1980ec;
+  color: #fff;
 }
 
 li.ui-timepicker-selected .ui-timepicker-duration,
 .ui-timepicker-list li:hover .ui-timepicker-duration {
-	color: #ccc;
+  color: #ccc;
 }
 
 .ui-timepicker-list li.ui-timepicker-disabled,
 .ui-timepicker-list li.ui-timepicker-disabled:hover,
 .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	color: #888;
-	cursor: default;
+  color: #888;
+  cursor: default;
 }
 
 .ui-timepicker-list li.ui-timepicker-disabled:hover,
 .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
-	background: #f2f2f2;
+  background: #f2f2f2;
 }
diff --git a/assets/stylesheets/wizard/custom/field.scss b/assets/stylesheets/wizard/custom/field.scss
index 6ad99046..303c71d6 100644
--- a/assets/stylesheets/wizard/custom/field.scss
+++ b/assets/stylesheets/wizard/custom/field.scss
@@ -1,14 +1,14 @@
 .custom-wizard {
   .wizard-field {
     margin-bottom: 1em;
-    
+
     .field-label {
       font-weight: 800;
     }
-    
+
     .field-image {
       margin-bottom: 0.5em;
-      
+
       img {
         max-width: 100%;
         max-height: 150px;
@@ -31,9 +31,12 @@
         margin: 0 5px;
       }
     }
-    
+
     &.invalid {
-      textarea, input[type=text], input[type=checkbox], .select-kit {
+      textarea,
+      input[type="text"],
+      input[type="checkbox"],
+      .select-kit {
         outline: 4px solid var(--danger);
       }
     }
@@ -43,7 +46,7 @@
     display: flex;
     align-items: center;
 
-    &> .input-area {
+    & > .input-area {
       order: 0;
       margin: 15px 20px !important;
 
@@ -54,12 +57,12 @@
       }
     }
 
-    &> label.field-label {
+    & > label.field-label {
       order: 1;
       font-weight: 400;
     }
 
-    &> .field-description {
+    & > .field-description {
       margin-top: 0;
       order: 2;
     }
@@ -83,7 +86,7 @@
     }
   }
 
-  .wizard-image-preview  {
+  .wizard-image-preview {
     margin-top: 10px;
     max-width: 500px;
     max-height: 500px;
@@ -155,8 +158,8 @@
   .select-kit.combo-box.group-dropdown {
     min-width: 220px;
   }
-  
+
   .text-field input {
     margin-bottom: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/locations.scss b/assets/stylesheets/wizard/custom/locations.scss
index ec46185f..9a2f74ec 100644
--- a/assets/stylesheets/wizard/custom/locations.scss
+++ b/assets/stylesheets/wizard/custom/locations.scss
@@ -49,7 +49,7 @@
     border-left: 1px solid var(--primary-low);
     padding-left: 20px;
   }
-  
+
   .control-group {
     display: inline-block;
     vertical-align: top;
@@ -72,7 +72,8 @@
   }
 }
 
-input.input-location, div.input-location {
+input.input-location,
+div.input-location {
   max-height: 150px;
   background-color: var(--secondary);
   box-shadow: none;
@@ -111,7 +112,8 @@ input.input-location, div.input-location {
       top: 30px !important;
       box-sizing: border-box;
 
-      li, .no-results {
+      li,
+      .no-results {
         padding: 10px;
       }
 
@@ -128,7 +130,8 @@ input.input-location, div.input-location {
   background-color: var(--secondary);
   display: flex;
 
-  &:hover, &.selected {
+  &:hover,
+  &.selected {
     background-color: var(--tertiary);
     color: white;
 
@@ -185,4 +188,4 @@ input.input-location, div.input-location {
     text-align: center;
     color: #919191;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/step.scss b/assets/stylesheets/wizard/custom/step.scss
index 40c97c97..0a7123fe 100644
--- a/assets/stylesheets/wizard/custom/step.scss
+++ b/assets/stylesheets/wizard/custom/step.scss
@@ -11,7 +11,7 @@
 
   .wizard-step-title {
     flex: 0;
-    
+
     p {
       margin: 0 0 0.5em 0;
     }
@@ -70,7 +70,7 @@
 
     img.large {
       width: 150;
-      padding: 25px;;
+      padding: 25px;
     }
 
     img.small {
@@ -110,7 +110,7 @@
     max-height: initial;
     width: 100%;
   }
-  
+
   .wizard-progress {
     .screen {
       background-color: var(--tertiary);
@@ -119,7 +119,7 @@
 
   .step-message {
     text-align: center;
-    transition: all .2s;
+    transition: all 0.2s;
     z-index: 2;
     padding: 20px;
 
@@ -137,15 +137,15 @@
       background-color: var(--danger);
       color: var(--secondary);
     }
-    
+
     .text {
       display: inline-block;
     }
-    
+
     .reset-wizard {
       margin-top: 20px;
       text-decoration: underline;
       cursor: pointer;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/validators.scss b/assets/stylesheets/wizard/custom/validators.scss
index f5227688..93368e70 100644
--- a/assets/stylesheets/wizard/custom/validators.scss
+++ b/assets/stylesheets/wizard/custom/validators.scss
@@ -1,7 +1,7 @@
 .similar-topics-validator {
   position: relative;
   display: flex;
-  
+
   label {
     min-height: 20px;
   }
@@ -9,7 +9,7 @@
 
 .wizard-similar-topics {
   margin-left: 3px;
-  
+
   ul {
     background-color: var(--tertiary-low);
     padding: 5px;
@@ -22,19 +22,19 @@
     width: 100%;
     box-sizing: border-box;
     z-index: 100;
-    
+
     .title {
       color: var(--primary);
     }
-    
+
     .blurb {
       margin-left: 0.5em;
       color: var(--primary-high);
       font-size: $font-down-1;
     }
   }
-  
+
   .show-topics {
     cursor: pointer;
   }
-}
\ No newline at end of file
+}
diff --git a/assets/stylesheets/wizard/custom/wizard.scss b/assets/stylesheets/wizard/custom/wizard.scss
index 683c4ef9..e6102ac4 100644
--- a/assets/stylesheets/wizard/custom/wizard.scss
+++ b/assets/stylesheets/wizard/custom/wizard.scss
@@ -2,24 +2,26 @@
   background-color: var(--secondary);
   color: var(--primary);
   font-size: 1.1em;
-  
+
   .wizard-column {
     background-color: var(--secondary);
-    
+
     .wizard-field .input-area {
       margin: 0.5em 0;
     }
 
     .wizard-column-contents h1 {
-      margin: 0
+      margin: 0;
     }
-    
+
     .wizard-footer {
       background-color: var(--secondary);
     }
   }
-  
-  .wizard-buttons > a, .wizard-buttons > button, .spinner {
+
+  .wizard-buttons > a,
+  .wizard-buttons > button,
+  .spinner {
     display: inline-block;
     vertical-align: middle;
   }
@@ -27,25 +29,25 @@
   .spinner.small {
     margin-right: 10px;
   }
-  
+
   .wizard-column .wizard-btn {
     color: var(--primary);
     background: var(--primary-low);
     cursor: pointer;
-    
+
     &.primary,
     &.next {
       color: var(--secondary);
       background: var(--tertiary);
     }
   }
-  
+
   .wizard-column .wizard-step-footer button.wizard-btn.done,
   .wizard-column .wizard-step-footer button.wizard-btn.finish {
     color: var(--secondary);
     background-color: var(--success);
   }
-  
+
   .wizard-column .action-link {
     color: var(--tertiary);
   }
@@ -59,7 +61,7 @@
 
 /* IE11 hacks */
 
-@media all and (-ms-high-contrast:none) {
+@media all and (-ms-high-contrast: none) {
   .custom-wizard {
     div.wizard-step-contents {
       display: block;
@@ -69,4 +71,4 @@
       visibility: hidden;
     }
   }
-}
\ No newline at end of file
+}

From a76cda0c0246c44519faa94e1edc25c809109b69 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Mon, 12 Apr 2021 19:49:53 +0530
Subject: [PATCH 11/17] fixed linting for all the hbs files

---
 .../admin-menu/wizards-nav-button.hbs         |   2 +-
 .../top-notices/prompt-completion.hbs         |   8 +-
 .../templates/admin-wizards-api-show.hbs      | 118 ++---
 .../discourse/templates/admin-wizards-api.hbs |   6 +-
 .../templates/admin-wizards-custom-fields.hbs |  32 +-
 .../templates/admin-wizards-logs.hbs          |  10 +-
 .../templates/admin-wizards-manager.hbs       |  28 +-
 .../admin-wizards-submissions-show.hbs        |  38 +-
 .../templates/admin-wizards-submissions.hbs   |   4 +-
 .../templates/admin-wizards-wizard-show.hbs   | 126 ++---
 .../templates/admin-wizards-wizard.hbs        |  10 +-
 .../discourse/templates/admin-wizards.hbs     |  12 +-
 .../components/wizard-advanced-toggle.hbs     |   2 +-
 .../components/wizard-custom-action.hbs       | 470 +++++++++---------
 .../components/wizard-custom-field.hbs        | 454 ++++++++---------
 .../components/wizard-custom-step.hbs         | 222 ++++-----
 .../templates/components/wizard-links.hbs     |   8 +-
 .../components/wizard-mapper-input.hbs        |  14 +-
 .../components/wizard-mapper-pair.hbs         |   6 +-
 .../components/wizard-mapper-selector.hbs     |  20 +-
 .../templates/components/wizard-mapper.hbs    |  14 +-
 .../templates/components/wizard-message.hbs   |  10 +-
 .../wizard-realtime-validations.hbs           |  20 +-
 .../components/wizard-text-editor.hbs         |  14 +-
 .../templates/components/field-validators.hbs |  26 +-
 .../components/wizard-composer-editor.hbs     |   4 +-
 .../components/wizard-composer-hyperlink.hbs  |   8 +-
 .../templates/components/wizard-editor.hbs    |  14 +-
 .../components/wizard-field-checkbox.hbs      |   2 +-
 .../components/wizard-field-composer.hbs      |  12 +-
 .../components/wizard-field-dropdown.hbs      |   2 +-
 .../components/wizard-field-group.hbs         |   2 +-
 .../components/wizard-field-number.hbs        |   2 +-
 .../components/wizard-field-upload.hbs        |  12 +-
 .../templates/components/wizard-field-url.hbs |   2 +-
 .../templates/components/wizard-field.hbs     |  58 +--
 .../templates/components/wizard-no-access.hbs |   4 +-
 .../components/wizard-similar-topic.hbs       |   2 +-
 .../components/wizard-similar-topics.hbs      |  20 +-
 .../templates/components/wizard-step.hbs      |  32 +-
 .../javascripts/wizard/templates/custom.hbs   |  10 +-
 .../wizard/templates/custom.index.hbs         |  30 +-
 .../wizard/templates/custom.step.hbs          |   4 +-
 43 files changed, 953 insertions(+), 941 deletions(-)

diff --git a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
index 5398e27d..f76722fc 100644
--- a/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
+++ b/assets/javascripts/discourse/connectors/admin-menu/wizards-nav-button.hbs
@@ -1,3 +1,3 @@
 {{#if currentUser.admin}}
-  {{nav-item route='adminWizards' label='admin.wizard.nav_label'}}
+  {{nav-item route="adminWizards" label="admin.wizard.nav_label"}}
 {{/if}}
diff --git a/assets/javascripts/discourse/connectors/top-notices/prompt-completion.hbs b/assets/javascripts/discourse/connectors/top-notices/prompt-completion.hbs
index 503ee113..70c0b7c4 100644
--- a/assets/javascripts/discourse/connectors/top-notices/prompt-completion.hbs
+++ b/assets/javascripts/discourse/connectors/top-notices/prompt-completion.hbs
@@ -1,7 +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>
+  <div class="row">
+    <div class="alert alert-info alert-wizard">
+      <a href={{wizard.url}}>{{i18n "wizard.complete_custom" name=wizard.name}}</a>
     </div>
   </div>
-{{/each}}
\ No newline at end of file
+{{/each}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
index 465e11aa..4d3def3d 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
@@ -1,5 +1,5 @@
 <div class="wizard-api-header page">
-  <div class='buttons'>
+  <div class="buttons">
     {{#if updating}}
       {{loading-spinner size="small"}}
     {{else}}
@@ -23,7 +23,7 @@
 
   <div class="wizard-header">
     {{#if api.isNew}}
-      {{i18n 'admin.wizard.api.new'}}
+      {{i18n "admin.wizard.api.new"}}
     {{else}}
       {{api.title}}
     {{/if}}
@@ -31,14 +31,14 @@
 
   <div class="metadata">
     <div class="title">
-      <label>{{i18n 'admin.wizard.api.title'}}</label>
-      {{input value=api.title placeholder=(i18n 'admin.wizard.api.title_placeholder')}}
+      <label>{{i18n "admin.wizard.api.title"}}</label>
+      {{input value=api.title placeholder=(i18n "admin.wizard.api.title_placeholder")}}
     </div>
 
     <div class="name">
-      <label>{{i18n 'admin.wizard.api.name'}}</label>
+      <label>{{i18n "admin.wizard.api.name"}}</label>
       {{#if api.isNew}}
-        {{input value=api.name placeholder=(i18n 'admin.wizard.api.name_placeholder')}}
+        {{input value=api.name placeholder=(i18n "admin.wizard.api.name_placeholder")}}
       {{else}}
         {{api.name}}
       {{/if}}
@@ -64,7 +64,7 @@
   </div>
 
   <div class="wizard-header">
-    {{i18n 'admin.wizard.api.auth.label'}}
+    {{i18n "admin.wizard.api.auth.label"}}
   </div>
 </div>
 
@@ -72,13 +72,13 @@
   <div class="settings">
 
     <div class="wizard-header medium">
-      {{i18n 'admin.wizard.api.auth.settings'}}
+      {{i18n "admin.wizard.api.auth.settings"}}
     </div>
 
     {{#if showRedirectUri}}
       <div class="control-group redirect-uri">
         <div class="control-label">
-          <label>{{i18n 'admin.wizard.api.auth.redirect_uri'}}</label>
+          <label>{{i18n "admin.wizard.api.auth.redirect_uri"}}</label>
           <div class="controls">
             {{api.redirectUri}}
           </div>
@@ -87,14 +87,14 @@
     {{/if}}
 
     <div class="control-group auth-type">
-      <label>{{i18n 'admin.wizard.api.auth.type'}}</label>
+      <label>{{i18n "admin.wizard.api.auth.type"}}</label>
       <div class="controls">
         {{combo-box
-          value=api.authType 
+          value=api.authType
           content=authorizationTypes
           onChange=(action (mut api.authType))
           options=(hash
-            none='admin.wizard.api.auth.type_none'
+            none="admin.wizard.api.auth.type_none"
           )}}
       </div>
     </div>
@@ -102,7 +102,7 @@
     {{#if isOauth}}
       {{#if threeLeggedOauth}}
         <div class="control-group">
-          <label>{{i18n 'admin.wizard.api.auth.url'}}</label>
+          <label>{{i18n "admin.wizard.api.auth.url"}}</label>
           <div class="controls">
             {{input value=api.authUrl}}
           </div>
@@ -110,51 +110,51 @@
       {{/if}}
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.token_url'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.token_url"}}</label>
         <div class="controls">
           {{input value=api.tokenUrl}}
         </div>
       </div>
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.client_id'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.client_id"}}</label>
         <div class="controls">
           {{input value=api.clientId}}
         </div>
       </div>
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.client_secret'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.client_secret"}}</label>
         <div class="controls">
           {{input value=api.clientSecret}}
         </div>
       </div>
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.params.label'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.params.label"}}</label>
         <div class="controls">
           {{#each api.authParams as |param|}}
             <div class="param">
-              {{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'}}
+              {{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}}
 
     {{#if isBasicAuth}}
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.username'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.username"}}</label>
         <div class="controls">
           {{input value=api.username}}
         </div>
       </div>
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.auth.password'}}</label>
+        <label>{{i18n "admin.wizard.api.auth.password"}}</label>
         <div class="controls">
           {{input value=api.password}}
         </div>
@@ -175,12 +175,12 @@
       </div>
 
       <div class="wizard-header medium">
-        {{i18n 'admin.wizard.api.status.label'}}
+        {{i18n "admin.wizard.api.status.label"}}
       </div>
 
       {{#if threeLeggedOauth}}
         <div class="control-group">
-          <label>{{i18n 'admin.wizard.api.status.code'}}</label>
+          <label>{{i18n "admin.wizard.api.status.code"}}</label>
           <div class="controls">
             {{api.code}}
           </div>
@@ -188,7 +188,7 @@
       {{/if}}
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.status.access_token'}}</label>
+        <label>{{i18n "admin.wizard.api.status.access_token"}}</label>
         <div class="controls">
           {{api.accessToken}}
         </div>
@@ -196,7 +196,7 @@
 
       {{#if threeLeggedOauth}}
         <div class="control-group">
-          <label>{{i18n 'admin.wizard.api.status.refresh_token'}}</label>
+          <label>{{i18n "admin.wizard.api.status.refresh_token"}}</label>
           <div class="controls">
             {{api.refreshToken}}
           </div>
@@ -204,14 +204,14 @@
       {{/if}}
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.status.expires_at'}}</label>
+        <label>{{i18n "admin.wizard.api.status.expires_at"}}</label>
         <div class="controls">
           {{api.tokenExpiresAt}}
         </div>
       </div>
 
       <div class="control-group">
-        <label>{{i18n 'admin.wizard.api.status.refresh_at'}}</label>
+        <label>{{i18n "admin.wizard.api.status.refresh_at"}}</label>
         <div class="controls">
           {{api.tokenRefreshAt}}
         </div>
@@ -221,11 +221,11 @@
 </div>
 
 <div class="wizard-header">
-  {{i18n 'admin.wizard.api.endpoint.label'}}
+  {{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">
@@ -236,14 +236,14 @@
               <div class="endpoint-">
                 <div class="top">
                   {{input value=endpoint.name
-                          placeholder=(i18n 'admin.wizard.api.endpoint.name')}}
+                          placeholder=(i18n "admin.wizard.api.endpoint.name")}}
                   {{input value=endpoint.url
-                          placeholder=(i18n 'admin.wizard.api.endpoint.url')
-                          class='endpoint-url'}}
+                          placeholder=(i18n "admin.wizard.api.endpoint.url")
+                          class="endpoint-url"}}
                   {{d-button action=(action "removeEndpoint")
                              actionParam=endpoint
-                             icon='times'
-                             class='remove-endpoint'}}
+                             icon="times"
+                             class="remove-endpoint"}}
                 </div>
                 <div class="bottom">
                   {{combo-box
@@ -278,33 +278,37 @@
 </div>
 
 <div class="wizard-header">
-  {{i18n 'admin.wizard.api.log.label'}}
+  {{i18n "admin.wizard.api.log.label"}}
   {{d-button action=(action "clearLogs")
-             icon='trash-alt'
-             class='clear-logs'}}
+             icon="trash-alt"
+             class="clear-logs"}}
 </div>
 
 <div class="wizard-api-log">
   <div class="log-list">
     <table class="wizard-api-log-table">
-      <th>Datetime</th>
-      <th>User</th>
-      <th>Status</th>
-      <th>URL</th>
-      <th>Error</th>
-      {{#each api.log as |logentry|}}
-        <tr>
-          <td>{{logentry.time}}</td>
-          <td class="user-image">
-            <div class="user-image-inner">
-              <a href="{{unbound logentry.userpath}}" data-user-card="{{unbound logentry.username}}">{{avatar logentry imageSize="large"}}</a>
-            </div>
-          </td>
-          <td>{{logentry.status}}</td>
-          <td>{{logentry.url}}</td>
-          <td>{{logentry.error}}</td>
-        </tr>
-      {{/each}}
+      <thead>
+        <th>Datetime</th>
+        <th>User</th>
+        <th>Status</th>
+        <th>URL</th>
+        <th>Error</th>
+      </thead>
+      <tbody>
+        {{#each api.log as |logentry|}}
+          <tr>
+            <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="large"}}</a>
+              </div>
+            </td>
+            <td>{{logentry.status}}</td>
+            <td>{{logentry.url}}</td>
+            <td>{{logentry.error}}</td>
+          </tr>
+        {{/each}}
+      </tbody>
     </table>
   </div>
 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
index 5f0c02ff..00d8ad60 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
@@ -2,11 +2,11 @@
   {{combo-box
     value=apiName
     content=apiList
-    onChange=(route-action 'changeApi')
+    onChange=(route-action "changeApi")
     options=(hash
-      none='admin.wizard.api.select'
+      none="admin.wizard.api.select"
     )}}
-    
+
   {{d-button
     action="createApi"
     label="admin.wizard.api.create"
diff --git a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
index 4633344b..10501498 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
@@ -1,6 +1,6 @@
 <div class="admin-wizard-controls">
-  <h3>{{i18n 'admin.wizard.custom_field.nav_label'}}</h3>
-    
+  <h3>{{i18n "admin.wizard.custom_field.nav_label"}}</h3>
+
   <div class="buttons">
     {{d-button
       label="admin.wizard.custom_field.add"
@@ -14,23 +14,27 @@
   opts=messageOpts
   type=messageType
   url=documentationUrl
-  component='custom_fields'}}
+  component="custom_fields"}}
 
 <div class="admin-wizard-container">
   {{#if customFields}}
     <table>
-      <tr>
-        {{#each fieldKeys as |key|}}
-          <th>{{i18n (concat "admin.wizard.custom_field." key ".label")}}</th>
+      <thead>
+        <tr>
+          {{#each fieldKeys as |key|}}
+            <th>{{i18n (concat "admin.wizard.custom_field." key ".label")}}</th>
+          {{/each}}
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        {{#each customFields as |field|}}
+          {{custom-field-input
+            field=field
+            removeField=(action "removeField")
+            saveField=(action "saveField")}}
         {{/each}}
-        <th></th>
-      </tr>
-      {{#each customFields as |field|}}
-        {{custom-field-input
-          field=field
-          removeField=(action 'removeField')
-          saveField=(action 'saveField')}}
-      {{/each}}
+      </tbody>
     </table>
   {{/if}}
 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
index 28052fe2..f98623aa 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
@@ -1,6 +1,6 @@
 <div class="admin-wizard-controls">
-  <h3>{{i18n 'admin.wizard.log.nav_label'}}</h3>
-  
+  <h3>{{i18n "admin.wizard.log.nav_label"}}</h3>
+
   {{d-button
     label="refresh"
     icon="refresh"
@@ -10,7 +10,7 @@
 
 {{#load-more selector=".log-list tr" action=(action "loadMore") class="wizard-logs"}}
   {{#if noResults}}
-    <p>{{i18n 'search.no_results'}}</p>
+    <p>{{i18n "search.no_results"}}</p>
   {{else}}
     <table class="table grid">
       <thead>
@@ -27,8 +27,8 @@
           </tr>
         {{/each}}
       </tbody>
-    </table>  
+    </table>
   {{/if}}
-  
+
   {{conditional-loading-spinner condition=refreshing}}
 {{/load-more}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
index 3eda71e2..cc26d808 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
@@ -1,18 +1,18 @@
 <div class="admin-wizard-controls">
-  <h3>{{i18n 'admin.wizard.manager.title'}}</h3>
-  
+  <h3>{{i18n "admin.wizard.manager.title"}}</h3>
+
   <div class="buttons">
     {{#if filename}}
       <div class="filename">
-        <a {{action 'clearFile'}}>
-          {{d-icon 'times'}}
+        <a role="button" {{action "clearFile"}}>
+          {{d-icon "times"}}
         </a>
         <span>{{filename}}</span>
       </div>
     {{/if}}
-    
+
     {{input
-      id='file-upload'
+      id="file-upload"
       type="file"
       accept="application/json"
       change=(action "setFile")}}
@@ -45,15 +45,15 @@
   opts=messageOpts
   items=messageItems
   loading=loading
-  component='manager'}}
+  component="manager"}}
 
 <div class="admin-wizard-container">
   <table class="table grid">
     <thead>
       <tr>
-        <th>{{i18n 'admin.wizard.label'}}</th>
-        <th class="control-column">{{i18n 'admin.wizard.manager.export'}}</th>
-        <th class="control-column">{{i18n 'admin.wizard.manager.destroy'}}</th>
+        <th>{{i18n "admin.wizard.label"}}</th>
+        <th class="control-column">{{i18n "admin.wizard.manager.export"}}</th>
+        <th class="control-column">{{i18n "admin.wizard.manager.destroy"}}</th>
       </tr>
     </thead>
     <tbody>
@@ -65,16 +65,16 @@
             {{/link-to}}
           </td>
           <td class="control-column">
-            {{input 
+            {{input
               type="checkbox"
               class="export"
-              change=(action 'selectWizard')}}
+              change=(action "selectWizard")}}
           </td>
           <td class="control-column">
-            {{input 
+            {{input
               type="checkbox"
               class="destroy"
-              change=(action 'selectWizard')}}
+              change=(action "selectWizard")}}
           </td>
         </tr>
       {{/each}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
index 3b4cb401..6d1f255b 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
@@ -1,29 +1,33 @@
 {{#if submissions}}
   <div class="wizard-header large">
-    <label>{{i18n 'admin.wizard.submissions.title' name=wizard.name}}</label>
-    
-    <a class="btn btn-default download-link" href="{{downloadUrl}}" target="_blank">
-       {{d-icon 'download'}}
-       <span class="d-button-label">
-         {{i18n "admin.wizard.submissions.download"}}
-       </span>
+    <label>{{i18n "admin.wizard.submissions.title" name=wizard.name}}</label>
+
+    <a class="btn btn-default download-link" href={{downloadUrl}} target="_blank" rel="noopener noreferrer">
+      {{d-icon "download"}}
+      <span class="d-button-label">
+        {{i18n "admin.wizard.submissions.download"}}
+      </span>
     </a>
   </div>
 
   <div class="wizard-submissions">
     <table>
-      <tr>
-        {{#each fields as |f|}}
-          <th>{{f}}</th>
-        {{/each}}
-      </tr>
-      {{#each submissions as |s|}}
+      <thead>
         <tr>
-          {{#each-in s as |k v|}}
-            <td>{{v}}</td>
-          {{/each-in}}
+          {{#each fields as |f|}}
+            <th>{{f}}</th>
+          {{/each}}
         </tr>
-      {{/each}}
+      </thead>
+      <tbody>
+        {{#each submissions as |s|}}
+          <tr>
+            {{#each-in s as |k v|}}
+              <td>{{v}}</td>
+            {{/each-in}}
+          </tr>
+        {{/each}}
+      </tbody>
     </table>
   </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
index ca0b835e..d843485a 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions.hbs
@@ -2,9 +2,9 @@
   {{combo-box
     value=wizardId
     content=wizardList
-    onChange=(route-action 'changeWizard')
+    onChange=(route-action "changeWizard")
     options=(hash
-      none='admin.wizard.select'
+      none="admin.wizard.select"
     )}}
 </div>
 
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
index 65cbc16e..7e5b0ee0 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
@@ -1,10 +1,10 @@
-{{#if wizard}}  
+{{#if wizard}}
   <div class="wizard-header large">
     {{input
       name="name"
       value=wizard.name
       placeholderKey="admin.wizard.name_placeholder"}}
-    
+
     <div class="wizard-url">
       {{#if wizard.name}}
         {{#if copiedUrl}}
@@ -12,15 +12,15 @@
         {{else}}
           {{d-button action=(action "copyUrl") class="pull-right no-text" icon="copy"}}
         {{/if}}
-        <a href="{{wizardUrl}}" target="_blank">{{wizardUrl}}</a>
+        <a href={{wizardUrl}} target="_blank" rel="noopener noreferrer">{{wizardUrl}}</a>
       {{/if}}
     </div>
   </div>
 
-  <div class="wizard-basic-details">    
+  <div class="wizard-basic-details">
     <div class="setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.background'}}</label>
+        <label>{{i18n "admin.wizard.background"}}</label>
       </div>
       <div class="setting-value">
         {{input
@@ -30,127 +30,127 @@
           class="small"}}
       </div>
     </div>
-    
+
     <div class="setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.theme_id'}}</label>
+        <label>{{i18n "admin.wizard.theme_id"}}</label>
       </div>
       <div class="setting-value">
         {{combo-box
           content=themes
-          valueProperty='id'
+          valueProperty="id"
           value=wizard.theme_id
           onChange=(action (mut wizard.theme_id))
           options=(hash
-            none='admin.wizard.no_theme'
+            none="admin.wizard.no_theme"
           )}}
       </div>
     </div>
   </div>
 
   <div class="wizard-header medium">
-    {{i18n 'admin.wizard.label'}}
+    {{i18n "admin.wizard.label"}}
   </div>
 
   <div class="wizard-settings">
     <div class="setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.required'}}</label>
+        <label>{{i18n "admin.wizard.required"}}</label>
       </div>
       <div class="setting-value">
-        {{input type='checkbox' checked=wizard.required}}
-        <span>{{i18n 'admin.wizard.required_label'}}</span>
+        {{input type="checkbox" checked=wizard.required}}
+        <span>{{i18n "admin.wizard.required_label"}}</span>
       </div>
     </div>
 
     <div class="setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.after_signup'}}</label>
+        <label>{{i18n "admin.wizard.after_signup"}}</label>
       </div>
       <div class="setting-value">
-        {{input type='checkbox' checked=wizard.after_signup}}
-        <span>{{i18n 'admin.wizard.after_signup_label'}}</span>
-      </div>
-    </div>
-    
-    <div class="setting">
-      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.multiple_submissions'}}</label>
-      </div>
-      <div class="setting-value">
-        {{input type='checkbox' checked=wizard.multiple_submissions}}
-        <span>{{i18n 'admin.wizard.multiple_submissions_label'}}</span>
+        {{input type="checkbox" checked=wizard.after_signup}}
+        <span>{{i18n "admin.wizard.after_signup_label"}}</span>
       </div>
     </div>
 
     <div class="setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.prompt_completion'}}</label>
+        <label>{{i18n "admin.wizard.multiple_submissions"}}</label>
       </div>
       <div class="setting-value">
-        {{input type='checkbox' checked=wizard.prompt_completion}}
-        <span>{{i18n 'admin.wizard.prompt_completion_label'}}</span>
+        {{input type="checkbox" checked=wizard.multiple_submissions}}
+        <span>{{i18n "admin.wizard.multiple_submissions_label"}}</span>
       </div>
     </div>
-    
+
+    <div class="setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.prompt_completion"}}</label>
+      </div>
+      <div class="setting-value">
+        {{input type="checkbox" checked=wizard.prompt_completion}}
+        <span>{{i18n "admin.wizard.prompt_completion_label"}}</span>
+      </div>
+    </div>
+
     <div class="setting full-inline">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.after_time'}}</label>
+        <label>{{i18n "admin.wizard.after_time"}}</label>
       </div>
       <div class="setting-value">
-        {{input type='checkbox' checked=wizard.after_time}}
-        <span>{{i18n 'admin.wizard.after_time_label'}}</span>
+        {{input type="checkbox" checked=wizard.after_time}}
+        <span>{{i18n "admin.wizard.after_time_label"}}</span>
         {{d-button
-          action='setNextSessionScheduled'
+          action="setNextSessionScheduled"
           translatedLabel=nextSessionScheduledLabel
           class="btn-after-time"
-          icon='far-calendar'}}
+          icon="far-calendar"}}
       </div>
     </div>
-    
+
     <div class="setting full field-mapper-setting">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.permitted'}}</label>
+        <label>{{i18n "admin.wizard.permitted"}}</label>
       </div>
       <div class="setting-value">
         {{wizard-mapper
           inputs=wizard.permitted
           options=(hash
-            context='wizard'
-            inputTypes='assignment,validation'
-            groupSelection='output'
-            userFieldSelection='key'
-            textSelection='value'
-            inputConnector='and'
+            context="wizard"
+            inputTypes="assignment,validation"
+            groupSelection="output"
+            userFieldSelection="key"
+            textSelection="value"
+            inputConnector="and"
           )}}
       </div>
     </div>
-    
+
     {{wizard-advanced-toggle showAdvanced=wizard.showAdvanced}}
-    
+
     {{#if wizard.showAdvanced}}
       <div class="advanced-settings">
-        
+
         <div class="setting">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.save_submissions'}}</label>
+            <label>{{i18n "admin.wizard.save_submissions"}}</label>
           </div>
           <div class="setting-value">
-            {{input type='checkbox' checked=wizard.save_submissions}}
-            <span>{{i18n 'admin.wizard.save_submissions_label'}}</span>
+            {{input type="checkbox" checked=wizard.save_submissions}}
+            <span>{{i18n "admin.wizard.save_submissions_label"}}</span>
           </div>
         </div>
-        
+
         <div class="setting">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.restart_on_revisit'}}</label>
+            <label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
           </div>
           <div class="setting-value">
-            {{input type='checkbox' checked=wizard.restart_on_revisit}}
-            <span>{{i18n 'admin.wizard.restart_on_revisit_label'}}</span>
+            {{input type="checkbox" checked=wizard.restart_on_revisit}}
+            <span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
           </div>
         </div>
-        
+
       </div>
     {{/if}}
   </div>
@@ -185,19 +185,19 @@
       wizardFields=wizardFields}}
   {{/each}}
 
-  <div class='admin-wizard-buttons'>
-    <button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>
-      {{i18n 'admin.wizard.save'}}
+  <div class="admin-wizard-buttons">
+    <button {{action "save"}} disabled={{disableSave}} class="btn btn-primary" type="button">
+      {{i18n "admin.wizard.save"}}
     </button>
-    
+
     {{#unless creating}}
-      <button {{action "remove"}} class='btn btn-danger remove'>
-        {{d-icon "far-trash-alt"}}{{i18n 'admin.wizard.remove'}}
+      <button {{action "remove"}} class="btn btn-danger remove" type="button">
+        {{d-icon "far-trash-alt"}}{{i18n "admin.wizard.remove"}}
       </button>
     {{/unless}}
-    
-    {{conditional-loading-spinner condition=saving size='small'}}
-    
+
+    {{conditional-loading-spinner condition=saving size="small"}}
+
     {{#if error}}
       <span class="error">{{d-icon "times"}}{{error}}</span>
     {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
index 049184e2..081cd5f3 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
@@ -2,11 +2,11 @@
   {{combo-box
     value=wizardListVal
     content=wizardList
-    onChange=(route-action 'changeWizard')
+    onChange=(route-action "changeWizard")
     options=(hash
-      none='admin.wizard.select'
+      none="admin.wizard.select"
     )}}
-  
+
   {{d-button
     action="createWizard"
     label="admin.wizard.create"
@@ -16,8 +16,8 @@
 {{wizard-message
   key=messageKey
   url=messageUrl
-  component='wizard'}}
+  component="wizard"}}
 
 <div class="admin-wizard-container settings">
   {{outlet}}
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards.hbs b/assets/javascripts/discourse/templates/admin-wizards.hbs
index c616e668..bd575aae 100644
--- a/assets/javascripts/discourse/templates/admin-wizards.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards.hbs
@@ -1,12 +1,12 @@
 {{#admin-nav}}
-  {{nav-item route='adminWizardsWizard' label='admin.wizard.nav_label'}}
-  {{nav-item route='adminWizardsCustomFields' label='admin.wizard.custom_field.nav_label'}}
-  {{nav-item route='adminWizardsSubmissions' label='admin.wizard.submissions.nav_label'}}
+  {{nav-item route="adminWizardsWizard" label="admin.wizard.nav_label"}}
+  {{nav-item route="adminWizardsCustomFields" label="admin.wizard.custom_field.nav_label"}}
+  {{nav-item route="adminWizardsSubmissions" label="admin.wizard.submissions.nav_label"}}
   {{#if siteSettings.wizard_apis_enabled}}
-    {{nav-item route='adminWizardsApi' label='admin.wizard.api.nav_label'}}
+    {{nav-item route="adminWizardsApi" label="admin.wizard.api.nav_label"}}
   {{/if}}
-  {{nav-item route='adminWizardsLogs' label='admin.wizard.log.nav_label'}}
-  {{nav-item route='adminWizardsManager' label='admin.wizard.manager.nav_label'}}
+  {{nav-item route="adminWizardsLogs" label="admin.wizard.log.nav_label"}}
+  {{nav-item route="adminWizardsManager" label="admin.wizard.manager.nav_label"}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs b/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
index e77e3a31..9f8563fc 100644
--- a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
@@ -1,4 +1,4 @@
 {{d-button
   action="toggleAdvanced"
-  label='admin.wizard.advanced'
+  label="admin.wizard.advanced"
   class=toggleClass}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index 265da2a3..121a797b 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -10,11 +10,11 @@
   <div class="setting-label">
     <label>{{i18n "admin.wizard.type"}}</label>
   </div>
-  
+
   <div class="setting-value">
     {{combo-box
       value=action.type
-      content=actionTypes
+      content=actionType
       onChange=(action "changeType")
       options=(hash
         none="admin.wizard.select_type"
@@ -26,7 +26,7 @@
   <div class="setting-label">
     <label>{{i18n "admin.wizard.action.run_after.label"}}</label>
   </div>
-  
+
   <div class="setting-value">
     {{combo-box
       value=action.run_after
@@ -38,23 +38,23 @@
 {{wizard-message
   key=messageKey
   url=messageUrl
-  component='action'}}
+  component="action"}}
 
 {{#if basicTopicFields}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.title"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.title
-        property='title'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="title"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
@@ -63,21 +63,21 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.post"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{combo-box
         value=action.post
-        content=wizardFields
-        nameProperty='label'
+        content=wizardField
+        nameProperty="label"
         onChange=(action (mut action.post))
         options=(hash
-          none='admin.wizard.selector.placeholder.wizard_field'
+          none="admin.wizard.selector.placeholder.wizard_field"
           isDisabled=showPostBuilder
         )}}
-      
+
       <div class="setting-gutter">
-        {{input type='checkbox' checked=action.post_builder}}
-        <span>{{i18n 'admin.wizard.action.post_builder.checkbox'}}</span>
+        {{input type="checkbox" checked=action.post_builder}}
+        <span>{{i18n "admin.wizard.action.post_builder.checkbox"}}</span>
       </div>
     </div>
   </div>
@@ -85,9 +85,9 @@
   {{#if action.post_builder}}
     <div class="setting full">
       <div class="setting-label">
-        <label>{{i18n 'admin.wizard.action.post_builder.label'}}</label>
+        <label>{{i18n "admin.wizard.action.post_builder.label"}}</label>
       </div>
-      
+
       <div class="setting-value editor">
         {{wizard-text-editor
           value=action.post_template
@@ -102,83 +102,83 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_topic.category"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.category
-        property='category'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="category"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='key,value'
+          textSelection="key,value"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          categorySelection='output'
-          wizardActionSelection='output'
-          outputDefaultSelection='category'
-          context='action'
+          userFieldSelection="key,value"
+          categorySelection="output"
+          wizardActionSelection="output"
+          outputDefaultSelection="category"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_topic.tags"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tags
-        property='tags'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.tag
+        property="tags"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          tagSelection='output'
-          outputDefaultSelection='tag'
-          listSelection='output'
+          tagSelection="output"
+          outputDefaultSelection="tag"
+          listSelection="output"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_topic.visible"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.visible
-        property='visible'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="visible"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
 {{/if}}
 
-{{#if sendMessage}}  
+{{#if sendMessage}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_message.recipient"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.recipient
-        property='recipient'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="recipient"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='value,output'
+          textSelection="value,output"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          groupSelection='key,value'
-          userSelection='output'
-          outputDefaultSelection='user'
-          context='action'
+          userFieldSelection="key,value"
+          groupSelection="key,value"
+          userSelection="output"
+          outputDefaultSelection="user"
+          context="action"
         )}}
     </div>
   </div>
@@ -187,21 +187,21 @@
 {{#if updateProfile}}
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n 'admin.wizard.action.update_profile.setting'}}</label>
+      <label>{{i18n "admin.wizard.action.update_profile.setting"}}</label>
     </div>
-    
-    {{wizard-mapper 
-      inputs=action.profile_updates
-      property='profile_updates'
-      onUpdate=(action 'mappedFieldUpdated')
+
+    {{wizard-mapper
+      inputs=action.profile_update
+      property="profile_updates"
+      onUpdate=(action "mappedFieldUpdated")
       options=(hash
-        inputTypes='association'
-        textSelection='value'
-        userFieldSelection='key'
-        wizardFieldSelection='value'
-        wizardActionSelection='value'
-        keyDefaultSelection='userField'
-        context='action'
+        inputTypes="association"
+        textSelection="value"
+        userFieldSelection="key"
+        wizardFieldSelection="value"
+        wizardActionSelection="value"
+        keyDefaultSelection="userField"
+        context="action"
       )}}
   </div>
 {{/if}}
@@ -211,15 +211,15 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_to_api.api"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{combo-box
         value=action.api
-        content=availableApis
+        content=availableApi
         onChange=(action (mut action.api))
         options=(hash
           isDisabled=action.custom_title_enabled
-          none='admin.wizard.action.send_to_api.select_an_api'
+          none="admin.wizard.action.send_to_api.select_an_api"
         )}}
     </div>
   </div>
@@ -228,15 +228,15 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_to_api.endpoint"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{combo-box
         value=action.api_endpoint
-        content=availableEndpoints
+        content=availableEndpoint
         onChange=(action (mut action.api_endpoint))
         options=(hash
           isDisabled=apiEmpty
-          none='admin.wizard.action.send_to_api.select_an_endpoint'
+          none="admin.wizard.action.send_to_api.select_an_endpoint"
         )}}
     </div>
   </div>
@@ -245,14 +245,14 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.send_to_api.body"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-text-editor
         value=action.api_body
         previewEnabled=false
         barEnabled=false
-        wizardFields=wizardFields
-        placeholder='admin.wizard.action.send_to_api.body_placeholder'}}
+        wizardFields=wizardField
+        placeholder="admin.wizard.action.send_to_api.body_placeholder"}}
     </div>
   </div>
 {{/if}}
@@ -262,20 +262,20 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.group"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.group
-        property='group'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="group"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='value,output'
-          wizardFieldSelection='key,value,assignment'
-          userFieldSelection='key,value,assignment'
+          textSelection="value,output"
+          wizardFieldSelection="key,value,assignment"
+          userFieldSelection="key,value,assignment"
           wizardActionSelection=true
-          groupSelection='value,output'
-          outputDefaultSelection='group'
-          context='action'
+          groupSelection="value,output"
+          outputDefaultSelection="group"
+          context="action"
         )}}
     </div>
   </div>
@@ -286,19 +286,19 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.route_to.url"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.url
-        property='url'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="url"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          context='action'
+          context="action"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          groupSelection='key,value'
-          categorySelection='key,value'
-          userSelection='key,value'
+          userFieldSelection="key,value"
+          groupSelection="key,value"
+          categorySelection="key,value"
+          userSelection="key,value"
         )}}
     </div>
   </div>
@@ -309,19 +309,19 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.watch_categories.categories"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.categories
-        property='categories'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.categorie
+        property="categories"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='key,value'
+          textSelection="key,value"
           wizardFieldSelection=true
           wizardActionSelection=true
-          userFieldSelection='key,value'
-          categorySelection='output'
-          context='action'
+          userFieldSelection="key,value"
+          categorySelection="output"
+          context="action"
         )}}
     </div>
   </div>
@@ -334,12 +334,12 @@
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.mute_remainder
-        property='mute_remainder'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="mute_remainder"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          context='action'
+          context="action"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
+          userFieldSelection="key,value"
         )}}
     </div>
   </div>
@@ -352,15 +352,15 @@
     <div class="setting-value">
       {{combo-box
         value=action.notification_level
-        content=availableNotificationLevels
+        content=availableNotificationLevel
         onChange=(action (mut action.notification_level))
         options=(hash
           isDisabled=action.custom_title_enabled
-          none='admin.wizard.action.watch_categories.select_a_notification_level'
+          none="admin.wizard.action.watch_categories.select_a_notification_level"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.watch_categories.wizard_user"}}</label>
@@ -370,7 +370,7 @@
       {{input type="checkbox" checked=action.wizard_user}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.watch_categories.usernames"}}</label>
@@ -378,14 +378,14 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
-        property='usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.username
+        property="usernames"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          context='action'
+          context="action"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          userSelection='output'
+          userFieldSelection="key,value"
+          userSelection="output"
         )}}
     </div>
   </div>
@@ -396,17 +396,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.name"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.name
-        property='name'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="name"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -414,17 +414,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.full_name"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.full_name
-        property='full_name'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="full_name"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -432,17 +432,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.title"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.title
-        property='title'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="title"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -450,17 +450,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.bio_raw"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.bio_raw
-        property='bio_raw'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="bio_raw"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -468,18 +468,18 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.owner_usernames"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.owner_usernames
-        property='owner_usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.owner_username
+        property="owner_usernames"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          userSelection='output'
-          context='action'
+          userSelection="output"
+          context="action"
         )}}
     </div>
   </div>
@@ -487,18 +487,18 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.usernames"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
-        property='usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.username
+        property="usernames"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          userSelection='output'
-          context='action'
+          userSelection="output"
+          context="action"
         )}}
     </div>
   </div>
@@ -506,17 +506,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.grant_trust_level"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.grant_trust_level
-        property='grant_trust_level'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="grant_trust_level"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -524,17 +524,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.mentionable_level"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.mentionable_level
-        property='mentionable_level'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="mentionable_level"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -542,17 +542,17 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.messageable_level"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.messageable_level
-        property='messageable_level'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="messageable_level"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -560,35 +560,35 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.visibility_level"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.visibility_level
-        property='visibility_level'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="visibility_level"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
-  </div>  
+  </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_group.members_visibility_level"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.members_visibility_level
-        property='members_visibility_level'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="members_visibility_level"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
           userFieldSelection=true
-          context='action'
+          context="action"
         )}}
     </div>
   </div>
@@ -599,116 +599,116 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.name"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.name
-        property='name'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="name"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='key,value'
+          textSelection="key,value"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.slug"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.slug
-        property='slug'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="slug"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.color"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.color
-        property='color'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="color"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.text_color"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.text_color
-        property='text_color'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="text_color"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
           textSelection=true
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          context='action'
+          userFieldSelection="key,value"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.parent_category"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=action.parent_category_id
-        property='parent_category_id'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="parent_category_id"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          textSelection='key,value'
+          textSelection="key,value"
           wizardFieldSelection=true
-          userFieldSelection='key,value'
-          categorySelection='output'
-          context='action'
+          userFieldSelection="key,value"
+          categorySelection="output"
+          context="action"
         )}}
     </div>
   </div>
-  
+
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
       <label>{{i18n "admin.wizard.action.create_category.permissions"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.permissions
-        property='permissions'
-        onUpdate=(action 'mappedFieldUpdated')
+        inputs=action.permission
+        property="permissions"
+        onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          inputTypes='association'
+          inputTypes="association"
           textSelection=true
           wizardFieldSelection=true
-          wizardActionSelection='key'
+          wizardActionSelection="key"
           userFieldSelection=true
-          groupSelection='key'
-          context='action'
+          groupSelection="key"
+          context="action"
         )}}
     </div>
   </div>
@@ -719,89 +719,89 @@
 
   {{#if action.showAdvanced}}
     <div class="advanced-settings">
-      
+
       {{#if hasCustomFields}}
         <div class="setting full field-mapper-setting">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.action.custom_fields.label'}}</label>
+            <label>{{i18n "admin.wizard.action.custom_fields.label"}}</label>
           </div>
-          
+
           <div class="setting-value">
             {{wizard-mapper
-              inputs=action.custom_fields
-              property='custom_fields'
-              onUpdate=(action 'mappedFieldUpdated')
+              inputs=action.custom_field
+              property="custom_fields"
+              onUpdate=(action "mappedFieldUpdated")
               options=(hash
-                inputTypes='association'
-                customFieldSelection='key'
-                wizardFieldSelection='value'
-                wizardActionSelection='value'
-                userFieldSelection='value'
-                keyPlaceholder='admin.wizard.action.custom_fields.key'
-                context='action'
+                inputTypes="association"
+                customFieldSelection="key"
+                wizardFieldSelection="value"
+                wizardActionSelection="value"
+                userFieldSelection="value"
+                keyPlaceholder="admin.wizard.action.custom_fields.key"
+                context="action"
               )}}
           </div>
         </div>
       {{/if}}
-      
+
       {{#if sendMessage}}
         <div class="setting full field-mapper-setting">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.required'}}</label>
+            <label>{{i18n "admin.wizard.required"}}</label>
           </div>
-          
+
           <div class="setting-value">
             {{wizard-mapper
               inputs=action.required
-              property='required'
-              onUpdate=(action 'mappedFieldUpdated')
+              property="required"
+              onUpdate=(action "mappedFieldUpdated")
               options=(hash
-                textSelection='value'
+                textSelection="value"
                 wizardFieldSelection=true
                 userFieldSelection=true
                 groupSelection=true
-                context='action'
+                context="action"
               )}}
           </div>
         </div>
       {{/if}}
-      
+
       {{#if showPostAdvanced}}
         <div class="setting full">
           <div class="setting-label">
             <label>{{i18n "admin.wizard.action.skip_redirect.label"}}</label>
           </div>
-          
+
           <div class="setting-value">
-            {{input type='checkbox' checked=action.skip_redirect}}
-            
+            {{input type="checkbox" checked=action.skip_redirect}}
+
             <span>
-              {{i18n 'admin.wizard.action.skip_redirect.description' type='topic'}}
+              {{i18n "admin.wizard.action.skip_redirect.description" type="topic"}}
             </span>
           </div>
         </div>
-        
+
         <div class="setting full">
           <div class="setting-label">
             <label>{{i18n "admin.wizard.action.suppress_notifications.label"}}</label>
           </div>
-          
+
           <div class="setting-value">
-            {{input type='checkbox' checked=action.suppress_notifications}}
-            
+            {{input type="checkbox" checked=action.suppress_notifications}}
+
             <span>
-              {{i18n 'admin.wizard.action.suppress_notifications.description' type='topic'}}
+              {{i18n "admin.wizard.action.suppress_notifications.description" type="topic"}}
             </span>
           </div>
         </div>
       {{/if}}
-      
+
       {{#if routeTo}}
         <div class="setting">
           <div class="setting-label">
             <label>{{i18n "admin.wizard.action.route_to.code"}}</label>
           </div>
-          
+
           <div class="setting-value">
             {{input value=action.code}}
           </div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
index 62c5ea1e..de97d44b 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@@ -1,227 +1,227 @@
-{{#if showUndo}}
-  {{d-button
-    action="undoChanges"
-    icon=undoIcon
-    label=undoKey
-    class="undo-changes"}}
-{{/if}}
-
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.label'}}</label>
-  </div>
-  <div class="setting-value">
-    {{input name="label" value=field.label}}
-  </div>
-</div>
-
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.required'}}</label>
-  </div>
-  
-  <div class="setting-value">
-    <span>{{i18n 'admin.wizard.field.required_label'}}</span>
-    {{input type='checkbox' checked=field.required}}
-  </div>
-</div>
-
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.description'}}</label>
-  </div>
-  <div class="setting-value">
-    {{textarea name="description" value=field.description}}
-  </div>
-</div>
-
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.image'}}</label>
-  </div>
-  <div class="setting-value">
-    {{image-uploader
-      imageUrl=field.image
-      onUploadDone=(action "imageUploadDone")
-      onUploadDeleted=(action "imageUploadDeleted")
-      type="wizard-step"
-      class="no-repeat contain-image"}}
-  </div>
-</div>
-
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.type'}}</label>
-  </div>
-  
-  <div class="setting-value">
-    {{combo-box
-      value=field.type
-      content=fieldTypes
-      onChange=(action "changeType")
-      options=(hash
-        none="admin.wizard.select_type"
-      )}}
-  </div>
-</div>
-
-{{wizard-message
-  key=messageKey
-  url=messageUrl
-  component='field'}}
-
-{{#if isTextType}}
-  <div class="setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.min_length'}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{input
-        type="number"
-        name="min_length"
-        value=field.min_length
-        class="small"}}
-    </div>
-  </div>
-
-  <div class="setting full">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.max_length'}}</label>
-    </div>
-
-    <div class="setting-value">
-      {{input
-        type="number"
-        name="max_length"
-        value=field.max_length
-        class="small"}}
-    </div>
-  </div>
-
-  <div class="setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.char_counter'}}</label>
-    </div>
-
-    <div class="setting-value">
-      <span>{{i18n 'admin.wizard.field.char_counter_placeholder'}}</span>
-      {{input
-        type="checkbox"
-        checked=field.char_counter}}
-    </div>
-  </div>
-{{/if}}
-
-{{#if isUpload}}
-  <div class="setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.file_types'}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{input value=field.file_types class="medium"}}
-    </div>
-  </div>
-{{/if}}
-
-{{#if showLimit}}
-  <div class="setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.limit'}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{input type="number" value=field.limit class="small"}}
-    </div>
-  </div>
-{{/if}}
-
-{{#if isDateTime}}
-  <div class="setting">
-    <div class="setting-label">
-      <label>{{{i18n 'admin.wizard.field.date_time_format.label'}}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{input value=field.format class="medium"}}
-      <label>{{{i18n 'admin.wizard.field.date_time_format.instructions'}}}</label>
-    </div>
-  </div>
-{{/if}}
-
-{{#if showPrefill}}
-  <div class="setting full field-mapper-setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.prefill'}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{wizard-mapper
-        inputs=field.prefill
-        property='prefill'
-        onUpdate=(action 'mappedFieldUpdated')
-        options=prefillOptions}}
-    </div>
-  </div>
-{{/if}}
-
-{{#if showContent}}
-  <div class="setting full field-mapper-setting">
-    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.content'}}</label>
-    </div>
-    
-    <div class="setting-value">
-      {{wizard-mapper
-        inputs=field.content
-        property='content'
-        onUpdate=(action 'mappedFieldUpdated')
-        options=contentOptions}}
-    </div>
-  </div>
-{{/if}}
-
-{{#if showAdvanced}}
-  {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
-
-  {{#if field.showAdvanced}}
-    <div class="advanced-settings">
-      
-      {{#if isCategory}}
-        <div class="setting">
-          <div class="setting-label">
-            <label>{{i18n 'admin.wizard.field.property'}}</label>
-          </div>
-          
-          <div class="setting-value">
-            {{combo-box
-              value=field.property
-              content=categoryPropertyTypes
-              onChange=(action (mut field.property))
-              options=(hash
-                none='admin.wizard.selector.placeholder.property'
-              )}}
-          </div>
-        </div>
-      {{/if}}
-      
-      <div class="setting">
-        <div class="setting-label">
-          <label>{{i18n 'admin.wizard.translation'}}</label>
-        </div>
-        <div class="setting-value medium">
-          {{input
-            name="key"
-            value=field.key
-            class="medium"
-            placeholderKey="admin.wizard.translation_placeholder"}}
-        </div>
-      </div>
-      
-      {{#if validations}}
-        {{wizard-realtime-validations field=field validations=validations}}
-      {{/if}}
-    </div>
-  {{/if}}
-{{/if}}
+{{#if showUndo}}
+  {{d-button
+    action="undoChanges"
+    icon=undoIcon
+    label=undoKey
+    class="undo-changes"}}
+{{/if}}
+
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.field.label"}}</label>
+  </div>
+  <div class="setting-value">
+    {{input name="label" value=field.label}}
+  </div>
+</div>
+
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.field.required"}}</label>
+  </div>
+  
+  <div class="setting-value">
+    <span>{{i18n "admin.wizard.field.required_label"}}</span>
+    {{input type="checkbox" checked=field.required}}
+  </div>
+</div>
+
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.field.description"}}</label>
+  </div>
+  <div class="setting-value">
+    {{textarea name="description" value=field.description}}
+  </div>
+</div>
+
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.field.image"}}</label>
+  </div>
+  <div class="setting-value">
+    {{image-uploader
+      imageUrl=field.image
+      onUploadDone=(action "imageUploadDone")
+      onUploadDeleted=(action "imageUploadDeleted")
+      type="wizard-step"
+      class="no-repeat contain-image"}}
+  </div>
+</div>
+
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.type"}}</label>
+  </div>
+  
+  <div class="setting-value">
+    {{combo-box
+      value=field.type
+      content=fieldTypes
+      onChange=(action "changeType")
+      options=(hash
+        none="admin.wizard.select_type"
+      )}}
+  </div>
+</div>
+
+{{wizard-message
+  key=messageKey
+  url=messageUrl
+  component="field"}}
+
+{{#if isTextType}}
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.min_length"}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{input
+        type="number"
+        name="min_length"
+        value=field.min_length
+        class="small"}}
+    </div>
+  </div>
+
+  <div class="setting full">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.max_length"}}</label>
+    </div>
+
+    <div class="setting-value">
+      {{input
+        type="number"
+        name="max_length"
+        value=field.max_length
+        class="small"}}
+    </div>
+  </div>
+
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.char_counter"}}</label>
+    </div>
+
+    <div class="setting-value">
+      <span>{{i18n "admin.wizard.field.char_counter_placeholder"}}</span>
+      {{input
+        type="checkbox"
+        checked=field.char_counter}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if isUpload}}
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.file_types"}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{input value=field.file_types class="medium"}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if showLimit}}
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.limit"}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{input type="number" value=field.limit class="small"}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if isDateTime}}
+  <div class="setting">
+    <div class="setting-label">
+      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.label")}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{input value=field.format class="medium"}}
+      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.instructions")}}</label>
+    </div>
+  </div>
+{{/if}}
+
+{{#if showPrefill}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.prefill"}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=field.prefill
+        property="prefill"
+        onUpdate=(action "mappedFieldUpdated")
+        options=prefillOptions}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if showContent}}
+  <div class="setting full field-mapper-setting">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.field.content"}}</label>
+    </div>
+    
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=field.content
+        property="content"
+        onUpdate=(action "mappedFieldUpdated")
+        options=contentOptions}}
+    </div>
+  </div>
+{{/if}}
+
+{{#if showAdvanced}}
+  {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
+
+  {{#if field.showAdvanced}}
+    <div class="advanced-settings">
+      
+      {{#if isCategory}}
+        <div class="setting">
+          <div class="setting-label">
+            <label>{{i18n "admin.wizard.field.property"}}</label>
+          </div>
+          
+          <div class="setting-value">
+            {{combo-box
+              value=field.property
+              content=categoryPropertyTypes
+              onChange=(action (mut field.property))
+              options=(hash
+                none="admin.wizard.selector.placeholder.property"
+              )}}
+          </div>
+        </div>
+      {{/if}}
+      
+      <div class="setting">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.translation"}}</label>
+        </div>
+        <div class="setting-value medium">
+          {{input
+            name="key"
+            value=field.key
+            class="medium"
+            placeholderKey="admin.wizard.translation_placeholder"}}
+        </div>
+      </div>
+      
+      {{#if validations}}
+        {{wizard-realtime-validations field=field validations=validations}}
+      {{/if}}
+    </div>
+  {{/if}}
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
index 147b9a21..e468c9ab 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
@@ -1,112 +1,112 @@
-<div class="setting">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.title'}}</label>
-  </div>
-  <div class="setting-value">
-    {{input
-      name="title"
-      value=step.title}}
-  </div>
-</div>
-
-<div class="setting full">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.banner'}}</label>
-  </div>
-  <div class="setting-value">
-    {{image-uploader
-      imageUrl=step.banner
-      onUploadDone=(action "bannerUploadDone")
-      onUploadDeleted=(action "bannerUploadDeleted")
-      type="wizard-banner"
-      class="no-repeat contain-image"}}
-  </div>
-</div>
-
-<div class="setting full">
-  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.description'}}</label>
-  </div>
-  <div class="setting-value">
-    {{wizard-text-editor
-      value=step.raw_description}}
-  </div>
-</div>
-
-{{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
-
-{{#if step.showAdvanced}}
-  <div class="advanced-settings">
-    
-    <div class="setting full field-mapper-setting">
-      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.step.required_data.label'}}</label>
-      </div>
-      <div class="setting-value">
-        {{wizard-mapper
-          inputs=step.required_data
-          options=(hash
-            inputTypes='validation'
-            inputConnector='and'
-            wizardFieldSelection='value'
-            userFieldSelection='value'
-            keyPlaceholder="admin.wizard.submission_key"
-            context='step'
-          )}}
-        {{#if step.required_data}}
-          <div class="required-data-message">
-            <div class="label">
-              {{i18n 'admin.wizard.step.required_data.not_permitted_message'}}
-            </div>
-            {{input value=step.required_data_message}}
-          </div>
-        {{/if}}
-      </div>
-    </div>
-
-    <div class="setting full field-mapper-setting">
-      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.step.permitted_params.label'}}</label>
-      </div>
-      <div class="setting-value">
-        {{wizard-mapper
-          inputs=step.permitted_params
-          options=(hash
-            pairConnector='set'
-            inputTypes='association'
-            keyPlaceholder='admin.wizard.param_key'
-            valuePlaceholder='admin.wizard.submission_key'
-            context='step'
-          )}}
-      </div>
-    </div>
-    
-    <div class="setting">
-      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.translation'}}</label>
-      </div>
-      <div class="setting-value">
-        {{input
-          name="key"
-          value=step.key
-          placeholderKey="admin.wizard.translation_placeholder"}}
-      </div>
-    </div>
-    
-  </div>
-{{/if}}
-
-{{wizard-links
-  itemType="field"
-  current=currentField
-  items=step.fields
-  parentId=step.id}}
-
-{{#each step.fields as |field|}}
-  {{wizard-custom-field
-    field=field
-    currentFieldId=currentField.id
-    fieldTypes=fieldTypes
-    removeField="removeField"
-    wizardFields=wizardFields}}
+<div class="setting">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.step.title"}}</label>
+  </div>
+  <div class="setting-value">
+    {{input
+      name="title"
+      value=step.title}}
+  </div>
+</div>
+
+<div class="setting full">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.step.banner"}}</label>
+  </div>
+  <div class="setting-value">
+    {{image-uploader
+      imageUrl=step.banner
+      onUploadDone=(action "bannerUploadDone")
+      onUploadDeleted=(action "bannerUploadDeleted")
+      type="wizard-banner"
+      class="no-repeat contain-image"}}
+  </div>
+</div>
+
+<div class="setting full">
+  <div class="setting-label">
+    <label>{{i18n "admin.wizard.step.description"}}</label>
+  </div>
+  <div class="setting-value">
+    {{wizard-text-editor
+      value=step.raw_description}}
+  </div>
+</div>
+
+{{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
+
+{{#if step.showAdvanced}}
+  <div class="advanced-settings">
+    
+    <div class="setting full field-mapper-setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
+      </div>
+      <div class="setting-value">
+        {{wizard-mapper
+          inputs=step.required_data
+          options=(hash
+            inputTypes="validation"
+            inputConnector="and"
+            wizardFieldSelection="value"
+            userFieldSelection="value"
+            keyPlaceholder="admin.wizard.submission_key"
+            context="step"
+          )}}
+        {{#if step.required_data}}
+          <div class="required-data-message">
+            <div class="label">
+              {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
+            </div>
+            {{input value=step.required_data_message}}
+          </div>
+        {{/if}}
+      </div>
+    </div>
+
+    <div class="setting full field-mapper-setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
+      </div>
+      <div class="setting-value">
+        {{wizard-mapper
+          inputs=step.permitted_params
+          options=(hash
+            pairConnector="set"
+            inputTypes="association"
+            keyPlaceholder="admin.wizard.param_key"
+            valuePlaceholder="admin.wizard.submission_key"
+            context="step"
+          )}}
+      </div>
+    </div>
+    
+    <div class="setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.translation"}}</label>
+      </div>
+      <div class="setting-value">
+        {{input
+          name="key"
+          value=step.key
+          placeholderKey="admin.wizard.translation_placeholder"}}
+      </div>
+    </div>
+    
+  </div>
+{{/if}}
+
+{{wizard-links
+  itemType="field"
+  current=currentField
+  items=step.fields
+  parentId=step.id}}
+
+{{#each step.fields as |field|}}
+  {{wizard-custom-field
+    field=field
+    currentFieldId=currentField.id
+    fieldTypes=fieldTypes
+    removeField="removeField"
+    wizardFields=wizardFields}}
 {{/each}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-links.hbs b/assets/javascripts/discourse/templates/components/wizard-links.hbs
index b24b5083..5271b043 100644
--- a/assets/javascripts/discourse/templates/components/wizard-links.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-links.hbs
@@ -1,14 +1,14 @@
-<div class="wizard-header medium">{{{i18n header}}}</div>
+<div class="wizard-header medium">{{html-safe (i18n header)}}</div>
 
 <div class="link-list">
   {{#if anyLinks}}
     {{#each links as |l|}}
-      <div data-id='{{l.id}}'>
+      <div data-id={{l.id}}>
         {{d-button action="change" actionParam=l.id translatedLabel=l.label class=l.classes}}
-        {{d-button action='remove' actionParam=l.id icon='times' class='remove'}}
+        {{d-button action="remove" actionParam=l.id icon="times" class="remove"}}
       </div>
     {{/each}}
   {{/if}}
-  {{d-button action='add' label='admin.wizard.add' icon='plus'}}
+  {{d-button action="add" label="admin.wizard.add" icon="plus"}}
 </div>
 
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
index 0373d634..410db070 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
@@ -15,13 +15,13 @@
         last=pair.last
         inputType=inputType
         options=options
-        removePair=(action 'removePair')
+        removePair=(action "removePair")
         onUpdate=onUpdate}}
     {{/each}}
-    
+
     {{#if canAddPair}}
-      <a {{action 'addPair'}} class="add-pair">
-        {{d-icon 'plus'}}
+      <a role="button" {{action "addPair"}} class="add-pair">
+        {{d-icon "plus"}}
       </a>
     {{/if}}
   </div>
@@ -40,7 +40,7 @@
 
   <div class="output mapper-block">
     {{wizard-mapper-selector
-      selectorType='output'
+      selectorType="output"
       inputType=input.type
       value=input.output
       activeType=input.output_type
@@ -49,6 +49,6 @@
   </div>
 {{/if}}
 
-<a class="remove-input" {{action remove input}}>
-  {{d-icon 'times'}}
+<a role="button" class="remove-input" {{action remove input}}>
+  {{d-icon "times"}}
 </a>
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
index 6c0b4aa6..272b0b58 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
@@ -1,6 +1,6 @@
 <div class="key mapper-block">
   {{wizard-mapper-selector
-    selectorType='key'
+    selectorType="key"
     inputType=inputType
     value=pair.key
     activeType=pair.key_type
@@ -18,7 +18,7 @@
 
 <div class="value mapper-block">
   {{wizard-mapper-selector
-    selectorType='value'
+    selectorType="value"
     inputType=inputType
     value=pair.value
     activeType=pair.value_type
@@ -31,5 +31,5 @@
 {{/if}}
 
 {{#if showRemove}}
-  <a {{action removePair pair}} class="remove-pair">{{d-icon 'times'}}</a>
+  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon "times"}}</a>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
index c86d2a7d..94870416 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
@@ -1,16 +1,16 @@
 <div class="type-selector">
   {{#if hasTypes}}
-    <a {{action "toggleTypes"}} class="active">
+    <a role="button" {{action "toggleTypes"}} class="active">
       {{activeTypeLabel}}
     </a>
-    
+
     {{#if showTypes}}
       <div class="selector-types">
         {{#each selectorTypes as |item|}}
           {{wizard-mapper-selector-type
             activeType=activeType
             item=item
-            toggle=(action 'toggleType')}}
+            toggle=(action "toggleType")}}
         {{/each}}
       </div>
     {{/if}}
@@ -38,7 +38,7 @@
         allowAny=comboBoxAllowAny
       )}}
   {{/if}}
-  
+
   {{#if showMultiSelect}}
     {{multi-select
       content=multiSelectContent
@@ -46,14 +46,14 @@
       onChange=(action "changeValue")
       options=multiSelectOptions}}
   {{/if}}
-  
+
   {{#if showList}}
     {{wizard-value-list
       values=value
       addKey=placeholderKey
       onChange=(action "changeValue")}}
   {{/if}}
-  
+
   {{#if showTag}}
     {{tag-chooser
       tags=value
@@ -63,13 +63,13 @@
         filterable=true
       )}}
   {{/if}}
-  
+
   {{#if showUser}}
-    {{user-selector 
-      includeMessageableGroups='true'
+    {{user-selector
+      includeMessageableGroups="true"
       placeholderKey=placeholderKey
       usernames=value
       autocomplete="discourse"
       onChangeCallback=(action "changeUserValue")}}
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
index 25ee9512..2de35e0d 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs
@@ -3,18 +3,18 @@
     {{wizard-mapper-connector
       connector=input.connector
       connectorType="input"
-      onUpdate=(action 'inputUpdated')}}
+      onUpdate=(action "inputUpdated")}}
   {{/if}}
-  
-  {{wizard-mapper-input 
+
+  {{wizard-mapper-input
     input=input
     options=inputOptions
-    remove=(action 'remove')
-    onUpdate=(action 'inputUpdated')}}
+    remove=(action "remove")
+    onUpdate=(action "inputUpdated")}}
 {{/each}}
 
 {{#if canAdd}}
   <span class="add-mapper-input">
-    {{d-button action='add' label='admin.wizard.add' icon='plus'}}
+    {{d-button action="add" label="admin.wizard.add" icon="plus"}}
   </span>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-message.hbs b/assets/javascripts/discourse/templates/components/wizard-message.hbs
index 78c7558b..4c48002a 100644
--- a/assets/javascripts/discourse/templates/components/wizard-message.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-message.hbs
@@ -2,13 +2,13 @@
   {{#if showIcon}}
     {{d-icon icon}}
   {{/if}}
-  <span class="message-content">{{{message}}}</span>
+  <span class="message-content">{{html-safe message}}</span>
   {{#if hasItems}}
     <ul>
       {{#each items as |item|}}
         <li>
           <span>{{d-icon item.icon}}</span>
-          <span>{{{item.html}}}</span>
+          <span>{{html-safe item.html}}</span>
         </li>
       {{/each}}
     </ul>
@@ -17,9 +17,9 @@
 
 {{#if showDocumentation}}
   <div class="message-block">
-    {{d-icon 'question-circle'}}
-        
-    <a href={{url}} target="_blank">
+    {{d-icon "question-circle"}}
+
+    <a href={{url}} target="_blank" rel="noopener noreferrer">
       {{documentation}}
     </a>
   </div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs b/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
index 39734761..cd1298a9 100644
--- a/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs
@@ -1,28 +1,28 @@
-<h3>{{i18n 'admin.wizard.field.validations.header'}}</h3>
+<h3>{{i18n "admin.wizard.field.validations.header"}}</h3>
 
 <ul>
   {{#each-in field.validations as |type props|}}
     <li>
       <span class="setting-title">
-        <h4>{{i18n (concat 'admin.wizard.field.validations.' type)}}</h4>
+        <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
         {{input type="checkbox" checked=props.status}}
-        {{i18n 'admin.wizard.field.validations.enabled'}}
+        {{i18n "admin.wizard.field.validations.enabled"}}
       </span>
       <div class="validation-container">
         <div class="validation-section">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.field.validations.categories'}}</label>
+            <label>{{i18n "admin.wizard.field.validations.categories"}}</label>
           </div>
           <div class="setting-value">
             {{category-selector
-                categories=(get this (concat 'validationBuffer.' type '.categories'))
-                onChange=(action 'updateValidationCategories' type props)
+                categories=(get this (concat "validationBuffer." type ".categories"))
+                onChange=(action "updateValidationCategories" type props)
                 class="wizard"}}
           </div>
         </div>
         <div class="validation-section">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.field.validations.max_topic_age'}}</label>
+            <label>{{i18n "admin.wizard.field.validations.max_topic_age"}}</label>
           </div>
           <div class="setting-value">
             {{input type="number" class="time-n-value" value=props.time_n_value}}
@@ -35,13 +35,13 @@
         </div>
         <div class="validation-section">
           <div class="setting-label">
-            <label>{{i18n 'admin.wizard.field.validations.position'}}</label>
+            <label>{{i18n "admin.wizard.field.validations.position"}}</label>
           </div>
           <div class="setting-value">
             {{radio-button name=(concat type field.id) value="above" selection=props.position}}
-            {{i18n 'admin.wizard.field.validations.above'}}
+            {{i18n "admin.wizard.field.validations.above"}}
             {{radio-button name=(concat type field.id) value="below" selection=props.position}}
-            {{i18n 'admin.wizard.field.validations.below'}}
+            {{i18n "admin.wizard.field.validations.below"}}
           </div>
         </div>
       </div>
diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
index 36be715f..a37f37a3 100644
--- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
@@ -9,29 +9,29 @@
       action="togglePreview"
       translatedLabel=previewLabel}}
   {{/if}}
-  
+
   {{#if fieldsEnabled}}
     {{d-button
       action="togglePopover"
       translatedLabel=popoverLabel}}
-    
+
     {{#if showPopover}}
       <div class="wizard-editor-gutter-popover">
         <label>
-          {{i18n 'admin.wizard.action.post_builder.user_properties'}}
+          {{i18n "admin.wizard.action.post_builder.user_properties"}}
           {{userPropertyList}}
         </label>
-        
+
         {{#if hasWizardFields}}
           <label>
-            {{i18n 'admin.wizard.action.post_builder.wizard_fields'}}
+            {{i18n "admin.wizard.action.post_builder.wizard_fields"}}
             {{wizardFieldList}}
           </label>
         {{/if}}
-        
+
         {{#if hasWizardActions}}
           <label>
-            {{i18n 'admin.wizard.action.post_builder.wizard_actions'}}
+            {{i18n "admin.wizard.action.post_builder.wizard_actions"}}
             {{wizardActionList}}
           </label>
         {{/if}}
diff --git a/assets/javascripts/wizard/templates/components/field-validators.hbs b/assets/javascripts/wizard/templates/components/field-validators.hbs
index 704c5c63..1fc04012 100644
--- a/assets/javascripts/wizard/templates/components/field-validators.hbs
+++ b/assets/javascripts/wizard/templates/components/field-validators.hbs
@@ -1,13 +1,13 @@
-{{#if field.validations}}
-  {{#each-in field.validations.above as |type validation|}}
-    {{component validation.component field=field type=type validation=validation}}
-  {{/each-in}}
-
-  {{yield (hash perform=(action 'perform') autocomplete="off")}}
-
-  {{#each-in field.validations.below as |type validation|}}
-    {{component validation.component field=field type=type validation=validation}}
-  {{/each-in}}
-{{else}}
-  {{yield}}
-{{/if}}
+{{#if field.validations}}
+  {{#each-in field.validations.above as |type validation|}}
+    {{component validation.component field=field type=type validation=validation}}
+  {{/each-in}}
+
+  {{yield (hash perform=(action "perform") autocomplete="off")}}
+
+  {{#each-in field.validations.below as |type validation|}}
+    {{component validation.component field=field type=type validation=validation}}
+  {{/each-in}}
+{{else}}
+  {{yield}}
+{{/if}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs b/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
index 03d56f85..1e7c27df 100644
--- a/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-composer-editor.hbs
@@ -25,8 +25,8 @@
 
 {{#if showHyperlinkBox}}
   {{wizard-composer-hyperlink
-    addLink=(action 'addLink')
-    hideBox=(action 'hideBox')}}
+    addLink=(action "addLink")
+    hideBox=(action "hideBox")}}
 {{/if}}
 
 {{#if isUploading}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-composer-hyperlink.hbs b/assets/javascripts/wizard/templates/components/wizard-composer-hyperlink.hbs
index f5b7afb5..c4403633 100644
--- a/assets/javascripts/wizard/templates/components/wizard-composer-hyperlink.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-composer-hyperlink.hbs
@@ -2,20 +2,20 @@
   <h3>{{wizard-i18n "composer.link_dialog_title"}}</h3>
   {{input
     class="composer-link-name"
-    placeholder=(wizard-i18n 'composer.link_optional_text')
+    placeholder=(wizard-i18n "composer.link_optional_text")
     type="text"
     value=linkName}}
   {{input
     class="composer-link-url"
-    placeholder=(wizard-i18n 'composer.link_url_placeholder')
+    placeholder=(wizard-i18n "composer.link_url_placeholder")
     type="text"
     value=linkUrl}}
   {{d-button
     label="wizard_composer.modal_ok"
     class="add-link btn-primary"
-    click=(action 'addLink')}}
+    click=(action "addLink")}}
   {{d-button
     label="wizard_composer.modal_cancel"
     class="hide-hyperlink-box btn-danger"
-    click=(action 'hideBox')}}
+    click=(action "hideBox")}}
 </div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-editor.hbs b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
index 189920ff..861d2449 100644
--- a/assets/javascripts/wizard/templates/components/wizard-editor.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-editor.hbs
@@ -1,15 +1,15 @@
-<div class='d-editor-overlay hidden'></div>
+<div class="d-editor-overlay hidden"></div>
 
-<div class='d-editor-container'>
+<div class="d-editor-container">
   {{#if showPreview}}
-    <div class="d-editor-preview-wrapper {{if forcePreview 'force-preview'}}">
+    <div class="d-editor-preview-wrapper {{if forcePreview "force-preview"}}">
       <div class="d-editor-preview">
-        {{{preview}}}
+        {{html-safe preview}}
       </div>
     </div>
   {{else}}
     <div class="d-editor-textarea-wrapper">
-      <div class='d-editor-button-bar'>
+      <div class="d-editor-button-bar">
         {{#each toolbar.groups as |group|}}
           {{#each group.buttons as |b|}}
             {{#if b.popupMenu}}
@@ -24,7 +24,7 @@
                 )}}
             {{else}}
               <div>{{d.icon}}</div>
-              <button class='wizard-btn {{b.className}}' {{action b.action b}} title="{{b.title}}">
+              <button class="wizard-btn {{b.className}}" {{action b.action b}} title={{b.title}} type="button">
                 {{d-icon b.icon}}
                 {{#if b.label}}
                   <span class="d-button-label">{{wizard-i18n b.label}}</span>
@@ -34,7 +34,7 @@
           {{/each}}
 
           {{#unless group.lastGroup}}
-            <div class='d-editor-spacer'></div>
+            <div class="d-editor-spacer"></div>
           {{/unless}}
         {{/each}}
       </div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs b/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
index d9ec7c91..8cbc2b3e 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
@@ -1 +1 @@
-{{input type='checkbox' id=field.id checked=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="checkbox" id=field.id checked=field.value tabindex=field.tabindex}}
\ No newline at end of file
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
index 3160d9fb..802c0339 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-composer.hbs
@@ -8,11 +8,11 @@
   afterRefresh=(action "afterRefresh")}}
 
 <div class="bottom-bar">
-<button class='wizard-btn toggle-preview' {{action 'togglePreview'}}>
-  <span class="d-button-label">{{wizard-i18n togglePreviewLabel}}</span>
-</button>
+  <button class="wizard-btn toggle-preview" {{action "togglePreview"}} type="button">
+    <span class="d-button-label">{{wizard-i18n togglePreviewLabel}}</span>
+  </button>
 
-{{#if field.char_counter}}
-  {{char-counter field.value field.max_length}}
-{{/if}}
+  {{#if field.char_counter}}
+    {{char-counter field.value field.max_length}}
+  {{/if}}
 </div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
index de4a4d83..fbb68721 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
@@ -1,4 +1,4 @@
-{{combo-box 
+{{combo-box
   class=fieldClass
   value=field.value
   content=field.content
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-group.hbs b/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
index c208d45f..0c3b102d 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
@@ -6,5 +6,5 @@
   tabindex=field.tabindex
   onChange=(action (mut field.value))
   options=(hash
-    none='group.select'
+    none="group.select"
   )}}
\ No newline at end of file
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-number.hbs b/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
index c90cca9d..8704dac0 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
@@ -1 +1 @@
-{{input type='number' step='0.01' id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="number" step="0.01" id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-upload.hbs b/assets/javascripts/wizard/templates/components/wizard-field-upload.hbs
index af5aeb79..f4bea9ff 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-upload.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-upload.hbs
@@ -1,4 +1,4 @@
-<label class="wizard-btn wizard-btn-upload-file {{if uploading 'disabled'}}" tabindex="{{field.tabindex}}">
+<label class="wizard-btn wizard-btn-upload-file {{if uploading "disabled"}}" tabindex={{field.tabindex}}>
   {{#if uploading}}
     {{wizard-i18n "wizard.uploading"}}
   {{else}}
@@ -6,13 +6,13 @@
     {{d-icon "upload"}}
   {{/if}}
 
-  <input disabled={{uploading}} type="file" accept="{{field.file_types}}" style="visibility: hidden; position: absolute;" />
+  <input disabled={{uploading}} type="file" accept={{field.file_types}} style="visibility: hidden; position: absolute;" >
 </label>
 
 {{#if field.value}}
-  {{#unless isImage}}
-    {{field.value.original_filename}}
-  {{else}}
+  {{#if isImage}}
     <img src={{field.value.url}}  class="wizard-image-preview">
-  {{/unless}}
+  {{else}}
+    {{field.value.original_filename}}
+  {{/if}}
 {{/if}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-url.hbs b/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
index f52b87c3..e9015010 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
@@ -1 +1 @@
-{{input type='text' id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="text" id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
diff --git a/assets/javascripts/wizard/templates/components/wizard-field.hbs b/assets/javascripts/wizard/templates/components/wizard-field.hbs
index 3a3c70d8..e0dd1551 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -1,29 +1,29 @@
-<label for={{field.id}} class="field-label">
-  {{{field.label}}}
-</label>
-
-{{#if field.image}}
-  <div class="field-image"><img src="{{field.image}}"></div>
-{{/if}}
-
-{{#if field.description}}
-  <div class='field-description'>{{cookedDescription}}</div>
-{{/if}}
-
-{{#field-validators field=field as |validators|}}
-  {{#if inputComponentName}}
-    <div class='input-area'>
-      {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard autocomplete=validators.autocomplete}}
-    </div>
-  {{/if}}
-{{/field-validators}}
-
-{{#if field.char_counter}}
-  {{#if textType}}
-    {{char-counter field.value field.max_length}}
-  {{/if}}
-{{/if}}
-
-{{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
-{{/if}}
+<label for={{field.id}} class="field-label">
+  {{html-safe field.label}}
+</label>
+
+{{#if field.image}}
+  <div class="field-image"><img src={{field.image}}></div>
+{{/if}}
+
+{{#if field.description}}
+  <div class="field-description">{{cookedDescription}}</div>
+{{/if}}
+
+{{#field-validators field=field as |validators|}}
+  {{#if inputComponentName}}
+    <div class="input-area">
+      {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard autocomplete=validators.autocomplete}}
+    </div>
+  {{/if}}
+{{/field-validators}}
+
+{{#if field.char_counter}}
+  {{#if textType}}
+    {{char-counter field.value field.max_length}}
+  {{/if}}
+{{/if}}
+
+{{#if field.errorDescription}}
+  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
+{{/if}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-no-access.hbs b/assets/javascripts/wizard/templates/components/wizard-no-access.hbs
index d3a2c192..f27be5b3 100644
--- a/assets/javascripts/wizard/templates/components/wizard-no-access.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-no-access.hbs
@@ -1,7 +1,7 @@
 <div>{{text}}</div>
 <div class="no-access-gutter">
-  <button class='wizard-btn primary return-to-site' {{action 'skip'}}>
-    {{wizard-i18n 'wizard.return_to_site' siteName=siteName}}
+  <button class="wizard-btn primary return-to-site" {{action "skip"}} type="button">
+    {{wizard-i18n "wizard.return_to_site" siteName=siteName}}
     {{d-icon "sign-out-alt"}}
   </button>
 </div>
diff --git a/assets/javascripts/wizard/templates/components/wizard-similar-topic.hbs b/assets/javascripts/wizard/templates/components/wizard-similar-topic.hbs
index eeaaa751..47197dbc 100644
--- a/assets/javascripts/wizard/templates/components/wizard-similar-topic.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-similar-topic.hbs
@@ -1,4 +1,4 @@
-<a href="{{topic.url}}" target="_blank">
+<a href={{topic.url}} target="_blank" rel="noopener noreferrer">
   <span class="title">{{html-safe topic.fancy_title}}</span>
   <div class="blurb">{{date-node topic.created_at}} - {{html-safe topic.blurb}}</div>
 </a>
diff --git a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
index 7eed935f..e3163517 100644
--- a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
@@ -1,11 +1,11 @@
-{{#if showTopics}}
-  <ul>
-    {{#each topics as |topic|}}
-      <li>{{wizard-similar-topic topic=topic}}</li>
-    {{/each}}
-  </ul>
-{{else}}
-  <a class="show-topics" {{action "toggleShowTopics"}}>
-    {{wizard-i18n 'realtime_validations.similar_topics.show'}}
-  </a>
+{{#if showTopics}}
+  <ul>
+    {{#each topics as |topic|}}
+      <li>{{wizard-similar-topic topic=topic}}</li>
+    {{/each}}
+  </ul>
+{{else}}
+  <a role="button" class="show-topics" {{action "toggleShowTopics"}}>
+    {{wizard-i18n "realtime_validations.similar_topics.show"}}
+  </a>
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/wizard/templates/components/wizard-step.hbs b/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 96115745..5277ef03 100644
--- a/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -1,8 +1,8 @@
-<div class='wizard-step-contents'>
+<div class="wizard-step-contents">
   {{#if step.title}}
-    <h1 class='wizard-step-title'>{{cookedTitle}}</h1>
+    <h1 class="wizard-step-title">{{cookedTitle}}</h1>
   {{/if}}
-  
+
   {{#if bannerImage}}
     <div class="wizard-step-banner">
       <img src={{bannerImage}}>
@@ -10,46 +10,46 @@
   {{/if}}
 
   {{#if step.description}}
-    <div class='wizard-step-description'>{{cookedDescription}}</div>
+    <div class="wizard-step-description">{{cookedDescription}}</div>
   {{/if}}
 
   {{#wizard-step-form step=step}}
-    {{#each step.fields as |field index|}}
+    {{#each step.fields as |field|}}
       {{wizard-field field=field step=step wizard=wizard}}
     {{/each}}
   {{/wizard-step-form}}
 </div>
 
-<div class='wizard-step-footer'>
+<div class="wizard-step-footer">
 
-  <div class='wizard-progress'>
-    <div class='white'></div>
-    <div class='black' style={{barStyle}}></div>
-    <div class='screen'></div>
+  <div class="wizard-progress">
+    <div class="white"></div>
+    <div class="black" style={{barStyle}}></div>
+    <div class="screen"></div>
     <span>{{wizard-i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
   </div>
 
-  <div class='wizard-buttons'>
+  <div class="wizard-buttons">
     {{#if saving}}
-      {{loading-spinner size='small'}}
+      {{loading-spinner size="small"}}
     {{else}}
       {{#if showQuitButton}}
-        <a href {{action "quit"}} class='action-link quit' tabindex="{{secondaryButtonIndex}}">{{wizard-i18n "wizard.quit"}}</a>
+        <a href {{action "quit"}} class="action-link quit" tabindex={{secondaryButtonIndex}}>{{wizard-i18n "wizard.quit"}}</a>
       {{/if}}
       {{#if showBackButton}}
-        <a href {{action "backStep"}} class='action-link back' tabindex="{{secondaryButtonIndex}}">{{wizard-i18n "wizard.back"}}</a>
+        <a href {{action "backStep"}} class="action-link back" tabindex={{secondaryButtonIndex}}>{{wizard-i18n "wizard.back"}}</a>
       {{/if}}
     {{/if}}
 
     {{#if showNextButton}}
-      <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="{{primaryButtonIndex}}">
+      <button type="button" class="wizard-btn next primary" {{action "nextStep"}} disabled={{saving}} tabindex={{primaryButtonIndex}}>
         {{wizard-i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button class='wizard-btn done' {{action "done"}} disabled={{saving}} tabindex="{{primaryButtonIndex}}">
+      <button type="button" class="wizard-btn done" {{action "done"}} disabled={{saving}} tabindex={{primaryButtonIndex}}>
         {{wizard-i18n "wizard.done"}}
       </button>
     {{/if}}
diff --git a/assets/javascripts/wizard/templates/custom.hbs b/assets/javascripts/wizard/templates/custom.hbs
index 509795f1..4701fec2 100644
--- a/assets/javascripts/wizard/templates/custom.hbs
+++ b/assets/javascripts/wizard/templates/custom.hbs
@@ -2,15 +2,15 @@
   {{wizard-canvas}}
 {{/if}}
 
-<div class='wizard-column'>
-  <div class='wizard-column-contents'>
+<div class="wizard-column">
+  <div class="wizard-column-contents">
     {{outlet}}
   </div>
-  <div class='wizard-footer'>
+  <div class="wizard-footer">
     {{#if customWizard}}
-      <img src="{{logoUrl}}" style="background-image: initial; width: 33px; height: 33px;"/>
+      <img src={{logoUrl}} style="background-image: initial; width: 33px; height: 33px;" >
     {{else}}
-      <div class='discourse-logo'></div>
+      <div class="discourse-logo"></div>
     {{/if}}
   </div>
 </div>
diff --git a/assets/javascripts/wizard/templates/custom.index.hbs b/assets/javascripts/wizard/templates/custom.index.hbs
index d233f45b..3cd02e05 100644
--- a/assets/javascripts/wizard/templates/custom.index.hbs
+++ b/assets/javascripts/wizard/templates/custom.index.hbs
@@ -1,15 +1,15 @@
-{{#if noWizard}}
-  {{wizard-no-access text=(wizard-i18n 'wizard.none') wizardId=wizardId}}
-{{else}}
-  {{#if requiresLogin}}
-    {{wizard-no-access text=(wizard-i18n 'wizard.requires_login') wizardId=wizardId}}
-  {{else}}
-    {{#if notPermitted}}
-      {{wizard-no-access text=(wizard-i18n 'wizard.not_permitted') wizardId=wizardId}}
-    {{else}}
-      {{#if completed}}
-        {{wizard-no-access text=(wizard-i18n 'wizard.completed') wizardId=wizardId}}
-      {{/if}}
-    {{/if}}
-  {{/if}}
-{{/if}}
+{{#if noWizard}}
+  {{wizard-no-access text=(wizard-i18n "wizard.none") wizardId=wizardId}}
+{{else}}
+  {{#if requiresLogin}}
+    {{wizard-no-access text=(wizard-i18n "wizard.requires_login") wizardId=wizardId}}
+  {{else}}
+    {{#if notPermitted}}
+      {{wizard-no-access text=(wizard-i18n "wizard.not_permitted") wizardId=wizardId}}
+    {{else}}
+      {{#if completed}}
+        {{wizard-no-access text=(wizard-i18n "wizard.completed") wizardId=wizardId}}
+      {{/if}}
+    {{/if}}
+  {{/if}}
+{{/if}}
diff --git a/assets/javascripts/wizard/templates/custom.step.hbs b/assets/javascripts/wizard/templates/custom.step.hbs
index 039c8099..6456a59c 100644
--- a/assets/javascripts/wizard/templates/custom.step.hbs
+++ b/assets/javascripts/wizard/templates/custom.step.hbs
@@ -4,8 +4,8 @@
       {{stepMessage.text}}
     </div>
     {{#if showReset}}
-      <a class="reset-wizard" {{action "resetWizard"}}>
-        {{wizard-i18n 'wizard.reset'}}
+      <a role="button" class="reset-wizard" {{action "resetWizard"}}>
+        {{wizard-i18n "wizard.reset"}}
       </a>
     {{/if}}
   </div>

From f443840358f926edc3cb2f11cdb3a427d4859fe6 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Wed, 14 Apr 2021 08:59:12 +0530
Subject: [PATCH 12/17] FEATURE: allow targetting multiple users/groups when
 sending a private message

---
 lib/custom_wizard/action.rb                  |  6 ++-
 spec/components/custom_wizard/action_spec.rb | 55 ++++++++++++++------
 spec/fixtures/wizard.json                    | 26 +++++++++
 3 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index fbfa17a5..6a650125 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -89,11 +89,13 @@ class CustomWizard::Action
       return
     end
 
+    params[:target_group_names] = []
+    params[:target_usernames] = []
     targets.each do |target|
       if Group.find_by(name: target)
-        params[:target_group_names] = target
+        params[:target_group_names] << target
       elsif User.find_by_username(target)
-        params[:target_usernames] = target
+        params[:target_usernames] << target
       else
         #
       end
diff --git a/spec/components/custom_wizard/action_spec.rb b/spec/components/custom_wizard/action_spec.rb
index 9ccb51bf..932539e5 100644
--- a/spec/components/custom_wizard/action_spec.rb
+++ b/spec/components/custom_wizard/action_spec.rb
@@ -67,26 +67,49 @@ describe CustomWizard::Action do
     end
   end
 
-  it 'sends a message' do
-    User.create(username: 'angus1', email: "angus1@email.com")
+  context 'sending a message' do
+    it 'works' do
+      User.create(username: 'angus1', email: "angus1@email.com")
 
-    wizard = CustomWizard::Builder.new(@template[:id], user).build
-    wizard.create_updater(wizard.steps[0].id, {}).update
-    wizard.create_updater(wizard.steps[1].id, {}).update
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, {}).update
+      wizard.create_updater(wizard.steps[1].id, {}).update
 
-    topic = Topic.where(
-      archetype: Archetype.private_message,
-      title: "Message title"
-    )
+      topic = Topic.where(
+        archetype: Archetype.private_message,
+        title: "Message title"
+      )
 
-    post = Post.where(
-      topic_id: topic.pluck(:id),
-      raw: "I will interpolate some wizard fields"
-    )
+      post = Post.where(
+        topic_id: topic.pluck(:id),
+        raw: "I will interpolate some wizard fields"
+      )
 
-    expect(topic.exists?).to eq(true)
-    expect(topic.first.topic_allowed_users.first.user.username).to eq('angus1')
-    expect(post.exists?).to eq(true)
+      expect(topic.exists?).to eq(true)
+      expect(topic.first.topic_allowed_users.first.user.username).to eq('angus1')
+      expect(post.exists?).to eq(true)
+    end
+
+    it 'allows using multiple PM targets' do
+      User.create(username: 'angus1', email: "angus1@email.com")
+      User.create(username: 'faiz', email: "faiz@email.com")
+      wizard = CustomWizard::Builder.new(@template[:id], user).build
+      wizard.create_updater(wizard.steps[0].id, {}).update
+      wizard.create_updater(wizard.steps[1].id, {}).update
+
+      topic = Topic.where(
+        archetype: Archetype.private_message,
+        title: "Multiple Recipients title"
+      )
+
+      post = Post.where(
+        topic_id: topic.pluck(:id),
+        raw: "I will interpolate some wizard fields"
+      )
+      expect(topic.exists?).to eq(true)
+      expect(topic.first.all_allowed_users.map(&:username)).to include('angus1', 'faiz')
+      expect(post.exists?).to eq(true)
+    end
   end
 
   it 'updates a profile' do
diff --git a/spec/fixtures/wizard.json b/spec/fixtures/wizard.json
index 3718b154..14210d7d 100644
--- a/spec/fixtures/wizard.json
+++ b/spec/fixtures/wizard.json
@@ -464,6 +464,32 @@
         }
       ]
     },
+    {
+      "id": "action_11",
+      "run_after": "step_2",
+      "type": "send_message",
+      "post_builder": true,
+      "post_template": "I will interpolate some wizard fields w{step_1_field_1} w{step_1_field_2}",
+      "title": [
+        {
+          "type": "assignment",
+          "output": "Multiple Recipients title",
+          "output_type": "text",
+          "output_connector": "set"
+        }
+      ],
+      "recipient": [
+        {
+          "type": "assignment",
+          "output_type": "user",
+          "output_connector": "set",
+          "output": [
+            "angus1",
+            "faiz"
+          ]
+        }
+      ]
+    },
     {
       "id": "action_3",
       "run_after": "step_2",

From bb08f50042ffdc1742258b672924cfaa31f5784d Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Wed, 14 Apr 2021 09:07:19 +0530
Subject: [PATCH 13/17] fixed  wrongly introduced variable name changes

---
 .../components/wizard-custom-action.hbs       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index 121a797b..f06e0d89 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -14,7 +14,7 @@
   <div class="setting-value">
     {{combo-box
       value=action.type
-      content=actionType
+      content=actionTypes
       onChange=(action "changeType")
       options=(hash
         none="admin.wizard.select_type"
@@ -67,7 +67,7 @@
     <div class="setting-value">
       {{combo-box
         value=action.post
-        content=wizardField
+        content=wizardFields
         nameProperty="label"
         onChange=(action (mut action.post))
         options=(hash
@@ -127,7 +127,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tag
+        inputs=action.tags
         property="tags"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -191,7 +191,7 @@
     </div>
 
     {{wizard-mapper
-      inputs=action.profile_update
+      inputs=action.profile_updates
       property="profile_updates"
       onUpdate=(action "mappedFieldUpdated")
       options=(hash
@@ -215,7 +215,7 @@
     <div class="setting-value">
       {{combo-box
         value=action.api
-        content=availableApi
+        content=availableApis
         onChange=(action (mut action.api))
         options=(hash
           isDisabled=action.custom_title_enabled
@@ -232,7 +232,7 @@
     <div class="setting-value">
       {{combo-box
         value=action.api_endpoint
-        content=availableEndpoint
+        content=availableEndpoints
         onChange=(action (mut action.api_endpoint))
         options=(hash
           isDisabled=apiEmpty
@@ -251,7 +251,7 @@
         value=action.api_body
         previewEnabled=false
         barEnabled=false
-        wizardFields=wizardField
+        wizardFields=wizardFields
         placeholder="admin.wizard.action.send_to_api.body_placeholder"}}
     </div>
   </div>
@@ -312,7 +312,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.categorie
+        inputs=action.categories
         property="categories"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -352,7 +352,7 @@
     <div class="setting-value">
       {{combo-box
         value=action.notification_level
-        content=availableNotificationLevel
+        content=availableNotificationLevels
         onChange=(action (mut action.notification_level))
         options=(hash
           isDisabled=action.custom_title_enabled
@@ -378,7 +378,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.username
+        inputs=action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -471,7 +471,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.owner_username
+        inputs=action.owner_usernames
         property="owner_usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -490,7 +490,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.username
+        inputs=action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -698,7 +698,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.permission
+        inputs=action.permissions
         property="permissions"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -728,7 +728,7 @@
 
           <div class="setting-value">
             {{wizard-mapper
-              inputs=action.custom_field
+              inputs=action.custom_fields
               property="custom_fields"
               onUpdate=(action "mappedFieldUpdated")
               options=(hash

From ce222c0c045d21b77b73a956178530c2168c486e Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Thu, 15 Apr 2021 02:15:20 +0530
Subject: [PATCH 14/17] modified spec to confirm working for multiple users and
 groups

---
 spec/components/custom_wizard/action_spec.rb | 3 +++
 spec/fixtures/wizard.json                    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/components/custom_wizard/action_spec.rb b/spec/components/custom_wizard/action_spec.rb
index 932539e5..ef6c4e57 100644
--- a/spec/components/custom_wizard/action_spec.rb
+++ b/spec/components/custom_wizard/action_spec.rb
@@ -93,6 +93,8 @@ describe CustomWizard::Action do
     it 'allows using multiple PM targets' do
       User.create(username: 'angus1', email: "angus1@email.com")
       User.create(username: 'faiz', email: "faiz@email.com")
+      Group.create(name: "cool_group")
+      Group.create(name: 'cool_group_1')
       wizard = CustomWizard::Builder.new(@template[:id], user).build
       wizard.create_updater(wizard.steps[0].id, {}).update
       wizard.create_updater(wizard.steps[1].id, {}).update
@@ -108,6 +110,7 @@ describe CustomWizard::Action do
       )
       expect(topic.exists?).to eq(true)
       expect(topic.first.all_allowed_users.map(&:username)).to include('angus1', 'faiz')
+      expect(topic.first.allowed_groups.map(&:name)).to include('cool_group', 'cool_group_1')
       expect(post.exists?).to eq(true)
     end
   end
diff --git a/spec/fixtures/wizard.json b/spec/fixtures/wizard.json
index 14210d7d..ccaea390 100644
--- a/spec/fixtures/wizard.json
+++ b/spec/fixtures/wizard.json
@@ -485,7 +485,9 @@
           "output_connector": "set",
           "output": [
             "angus1",
-            "faiz"
+            "faiz",
+            "cool_group",
+            "cool_group_1"
           ]
         }
       ]

From b71548427d964446997d3dfa145b1ac44f0d383e Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Fri, 16 Apr 2021 13:37:32 +0530
Subject: [PATCH 15/17] Added files used by github actions workflows (#78)

* Added files used by github actions workflows

* added simplecov report for tests workflow

* removed trailing space

* Rubocop fixes

* Update plugin-linting.yml

* Create Gemfile.lock

* Update Gemfile.lock

* Re-add bundler

* Update gitignore

* Limit yarn install to dev

* Update rubocop config and gemfile.lock

* allow strings to be mutated

* Update invites_controller_spec.rb

Co-authored-by: angusmcleod <angus@mcleod.org.au>
---
 .eslintrc                                     |   3 +
 .github/workflows/plugin-linting.yml          |  53 +++++++
 .github/workflows/plugin-tests.yml            | 137 ++++++++++++++++++
 .gitignore                                    |   4 +
 .prettierrc                                   |   1 +
 .rubocop.yml                                  |   2 +
 .template-lintrc.js                           |   4 +
 Gemfile                                       |   7 +
 Gemfile.lock                                  |  38 +++++
 .../wizard/templates/components/validator.hbs |   2 +-
 lib/custom_wizard/action.rb                   |   8 +-
 lib/custom_wizard/api/endpoint.rb             |   2 +-
 package.json                                  |  10 ++
 spec/components/custom_wizard/action_spec.rb  |   5 +-
 spec/components/custom_wizard/builder_spec.rb |   1 +
 .../similar_topics_spec.rb                    |   1 -
 spec/components/custom_wizard/wizard_spec.rb  |   4 +-
 spec/extensions/invites_controller_spec.rb    |   4 +-
 18 files changed, 273 insertions(+), 13 deletions(-)
 create mode 100644 .eslintrc
 create mode 100644 .github/workflows/plugin-linting.yml
 create mode 100644 .github/workflows/plugin-tests.yml
 create mode 100644 .prettierrc
 create mode 100644 .rubocop.yml
 create mode 100644 .template-lintrc.js
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock
 create mode 100644 package.json

diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..7898fbf8
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "eslint-config-discourse"
+}
diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml
new file mode 100644
index 00000000..a121658d
--- /dev/null
+++ b/.github/workflows/plugin-linting.yml
@@ -0,0 +1,53 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - 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
+
+      - name: Prettier
+        run: |
+          yarn prettier -v
+          if [ -d "assets" ]; then \
+            yarn prettier --list-different "assets/**/*.{scss,js,es6}" ; \
+          fi
+          if [ -d "test" ]; then \
+            yarn prettier --list-different "test/**/*.{js,es6}" ; \
+          fi
+
+      - name: Ember template lint
+        run: yarn ember-template-lint assets/javascripts
+
+      - name: Rubocop
+        run: bundle exec rubocop .
\ No newline at end of file
diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
new file mode 100644
index 00000000..ce6112af
--- /dev/null
+++ b/.github/workflows/plugin-tests.yml
@@ -0,0 +1,137 @@
+name: Plugin Tests
+
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+
+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: ["4.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: actions/checkout@v2
+        with:
+          repository: discourse/discourse
+          fetch-depth: 1
+
+      - name: Install plugin
+        uses: actions/checkout@v2
+        with:
+          path: plugins/${{ github.event.repository.name }}
+          fetch-depth: 1
+
+      - name: Check spec existence
+        id: check_spec
+        uses: andstor/file-existence-action@v1
+        with:
+          files: "plugins/${{ github.event.repository.name }}/spec"
+
+      - name: Check qunit existence
+        id: check_qunit
+        uses: andstor/file-existence-action@v1
+        with:
+          files: "plugins/${{ github.event.repository.name }}/test/javascripts"
+
+      - 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/${{ github.event.repository.name }}/locales/{client,server}.en.yml"
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn cache
+        uses: actions/cache@v2
+        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
+        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true'
+        run: bin/rake plugin:spec[${{ github.event.repository.name }}]
+
+      - name: Plugin QUnit
+        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true'
+        run: bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000']
+        timeout-minutes: 30
+
+      - name: Simplecov Report
+        if: matrix.build_type == 'backend'
+        run: COVERAGE=1 bin/rake plugin:spec[${{ github.event.repository.name }}]
diff --git a/.gitignore b/.gitignore
index 98902d6e..11ce0a3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 coverage/*
 !coverage/.last_run.json
 gems/
+.bundle/
+auto_generated
+.DS_Store
+node_modules/
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 00000000..d46296cf
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_gem:
+  rubocop-discourse: default.yml
diff --git a/.template-lintrc.js b/.template-lintrc.js
new file mode 100644
index 00000000..a558b8e3
--- /dev/null
+++ b/.template-lintrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+  plugins: ["ember-template-lint-plugin-discourse"],
+  extends: "discourse:recommended",
+};
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..7da32ec0
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+group :development do
+  gem 'rubocop-discourse'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..2416ce66
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,38 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.12.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-discourse (2.4.1)
+      rubocop (>= 1.1.0)
+      rubocop-rspec (>= 2.0.0)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rubocop-discourse
+
+BUNDLED WITH
+   2.2.16
diff --git a/assets/javascripts/wizard/templates/components/validator.hbs b/assets/javascripts/wizard/templates/components/validator.hbs
index 88ffa227..a233df9c 100644
--- a/assets/javascripts/wizard/templates/components/validator.hbs
+++ b/assets/javascripts/wizard/templates/components/validator.hbs
@@ -1,5 +1,5 @@
 {{#if isValid}}
   {{wizard-i18n validMessageKey}}
-{{else}}  
+{{else}}
   {{wizard-i18n invalidMessageKey}}
 {{/if}}
diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index fbfa17a5..0d01c8f0 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -307,15 +307,15 @@ class CustomWizard::Action
       return
     end
 
-    groups = group_map.reduce([]) do |groups, g|
+    groups = group_map.reduce([]) do |result, g|
       begin
-        groups.push(Integer(g))
+        result.push(Integer(g))
       rescue ArgumentError
         group = Group.find_by(name: g)
-        groups.push(group.id) if group
+        result.push(group.id) if group
       end
 
-      groups
+      result
     end
 
     result = nil
diff --git a/lib/custom_wizard/api/endpoint.rb b/lib/custom_wizard/api/endpoint.rb
index 71af3453..9dbbc590 100644
--- a/lib/custom_wizard/api/endpoint.rb
+++ b/lib/custom_wizard/api/endpoint.rb
@@ -74,7 +74,7 @@ class CustomWizard::Api::Endpoint
     headers["Authorization"] = auth_string if auth_string
     headers["Content-Type"] = content_type if content_type
 
-    connection = Excon.new(URI.parse(URI.encode(endpoint.url)).to_s, headers: headers)
+    connection = Excon.new(UrlHelper.encode_and_parse(endpoint.url), headers: headers)
 
     params = { method: endpoint.method }
 
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..c6692218
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "discourse-custom-wizard",
+  "version": "1.0.0",
+  "repository": "git@github.com:paviliondev/discourse-custom-wizard.git",
+  "author": "Discourse",
+  "license": "MIT",
+  "devDependencies": {
+    "eslint-config-discourse": "^1.1.8"
+  }
+}
diff --git a/spec/components/custom_wizard/action_spec.rb b/spec/components/custom_wizard/action_spec.rb
index 9ccb51bf..bbf266d4 100644
--- a/spec/components/custom_wizard/action_spec.rb
+++ b/spec/components/custom_wizard/action_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Action do
@@ -121,8 +122,8 @@ describe CustomWizard::Action do
     end
 
     it 'encodes special characters in the title and body' do
-      open_composer['title'][0]['output'] = "Title that's special $"
-      open_composer['post_template'] = "Body & more body & more body"
+      open_composer['title'][0]['output'] = "Title that's special $".dup
+      open_composer['post_template'] = "Body & more body & more body".dup
 
       wizard = CustomWizard::Wizard.new(@template, user)
 
diff --git a/spec/components/custom_wizard/builder_spec.rb b/spec/components/custom_wizard/builder_spec.rb
index 9ad4348e..54a6ceff 100644
--- a/spec/components/custom_wizard/builder_spec.rb
+++ b/spec/components/custom_wizard/builder_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Builder do
diff --git a/spec/components/custom_wizard/realtime_validations/similar_topics_spec.rb b/spec/components/custom_wizard/realtime_validations/similar_topics_spec.rb
index 7d871d45..eb81509e 100644
--- a/spec/components/custom_wizard/realtime_validations/similar_topics_spec.rb
+++ b/spec/components/custom_wizard/realtime_validations/similar_topics_spec.rb
@@ -5,7 +5,6 @@ require_relative '../../../plugin_helper'
 describe ::CustomWizard::RealtimeValidation::SimilarTopics do
   let(:post) {  create_post(title: "matching similar topic") }
   let(:topic) {  post.topic }
-  let(:user) { post.user }
 
   let(:category) { Fabricate(:category) }
   let(:cat_post) {  create_post(title: "matching similar topic slightly different", category: category) }
diff --git a/spec/components/custom_wizard/wizard_spec.rb b/spec/components/custom_wizard/wizard_spec.rb
index e613ddf9..57d15241 100644
--- a/spec/components/custom_wizard/wizard_spec.rb
+++ b/spec/components/custom_wizard/wizard_spec.rb
@@ -98,7 +98,7 @@ describe CustomWizard::Wizard do
       CustomWizard::Wizard.new(@permitted_template, trusted_user).permitted?
     ).to eq(true)
   end
-  
+
   it "permits everyone if everyone is permitted" do
     @permitted_template['permitted'][0]['output'] = Group::AUTO_GROUPS[:everyone]
     expect(
@@ -185,7 +185,7 @@ describe CustomWizard::Wizard do
     ).to eq('I am a user submission')
   end
 
-  context do
+  context "class methods" do
     before do
       CustomWizard::Template.save(@permitted_template, skip_jobs: true)
 
diff --git a/spec/extensions/invites_controller_spec.rb b/spec/extensions/invites_controller_spec.rb
index ee75500e..47c4ca84 100644
--- a/spec/extensions/invites_controller_spec.rb
+++ b/spec/extensions/invites_controller_spec.rb
@@ -4,7 +4,7 @@ require_relative '../plugin_helper'
 describe InvitesControllerCustomWizard, type: :request do
   fab!(:topic) { Fabricate(:topic) }
   let(:invite) { Invite.generate(topic.user, email: "angus@mcleod.org", topic: topic) }
-  
+
   let(:template) do
     JSON.parse(File.open(
       "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
@@ -19,6 +19,6 @@ describe InvitesControllerCustomWizard, type: :request do
     template['after_signup'] = true
     CustomWizard::Template.save(template, skip_jobs: true)
     put "/invites/show/#{invite.invite_key}.json"
-    expect(response.parsed_body["redirect_to"]).to eq("/w/super-mega-fun-wizard")
+    expect(cookies[:destination_url]).to eq("/w/super-mega-fun-wizard")
   end
 end

From 772392efae9eb35e9336f6cdd18e62024fd34ad3 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Sun, 18 Apr 2021 17:27:16 +0530
Subject: [PATCH 16/17] FIX: checkbox description alignment (#99)

---
 assets/stylesheets/wizard/custom/field.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/stylesheets/wizard/custom/field.scss b/assets/stylesheets/wizard/custom/field.scss
index 303c71d6..e5a7f5e2 100644
--- a/assets/stylesheets/wizard/custom/field.scss
+++ b/assets/stylesheets/wizard/custom/field.scss
@@ -46,7 +46,7 @@
     display: flex;
     align-items: center;
 
-    & > .input-area {
+    .input-area {
       order: 0;
       margin: 15px 20px !important;
 

From ceef3f4bc9cd1505ca017ca1c0e54e88415ce08b Mon Sep 17 00:00:00 2001
From: Angus McLeod <angusmcleod@users.noreply.github.com>
Date: Wed, 21 Apr 2021 03:58:19 +1000
Subject: [PATCH 17/17] Step and field conditionality (#87)

* Re structure builder logic to allow for step conditionality

Concerns
- Performance. Look at whether the additional build in the steps controller can be reduced
- Does not work if applied to the last step.
- Certain conditions will not work with the first step(?)
- How should this be scoped to known functionality?

* Add indexes and conditions to steps and fields

* Complete and add spec

* Complete backend

* Complete step conditionality and field indexing

* Fix failing spec

* Update coverage

* Apply rubocop

* Apply prettier

* Apply prettier to wizard js

* Fix schema issues created in merge

* Remove setting label for force_final

* Improve client wizard cache naming

* Improve steps controller and spec conditionality

* Improve final step attribute naming

* Fix failing spec

* Linting

* Add one more final step test

* Linting

* Fix eslint issues

* Apply prettier

* Linting, syntax, merge and copy cleanups

* Update wizard-admin.scss

* Fix template linting

* Rubocop fixes
---
 .../components/wizard-custom-field.js.es6     |  34 +++
 .../components/wizard-custom-step.js.es6      |  19 ++
 .../discourse/components/wizard-links.js.es6  |  17 +-
 .../discourse/lib/wizard-json.js.es6          |  96 ++++---
 .../discourse/lib/wizard-schema.js.es6        |  13 +-
 .../discourse/models/custom-wizard.js.es6     |   8 +-
 .../templates/admin-wizards-logs.hbs          |   2 +-
 .../templates/admin-wizards-manager.hbs       |   2 +-
 .../components/custom-field-input.hbs         |   2 +-
 .../components/wizard-advanced-toggle.hbs     |   2 +-
 .../components/wizard-custom-field.hbs        |  42 ++-
 .../components/wizard-custom-step.hbs         |  29 +-
 .../components/wizard-mapper-connector.hbs    |   2 +-
 .../components/wizard-mapper-pair.hbs         |   2 +-
 .../wizard-mapper-selector-type.hbs           |   2 +-
 .../templates/components/wizard-message.hbs   |   2 +-
 .../components/wizard-text-editor.hbs         |   2 +-
 .../wizard/controllers/custom-step.js.es6     |   9 +-
 .../initializers/custom-wizard-step.js.es6    |  12 +-
 .../javascripts/wizard/models/custom.js.es6   | 115 ++++----
 .../wizard/routes/custom-index.js.es6         |  17 +-
 .../wizard/routes/custom-step.js.es6          |  25 +-
 .../javascripts/wizard/routes/custom.js.es6   |  12 +-
 .../components/wizard-field-checkbox.hbs      |   2 +-
 .../components/wizard-field-date-time.hbs     |   2 +-
 .../components/wizard-field-date.hbs          |   2 +-
 .../components/wizard-field-dropdown.hbs      |   2 +-
 .../components/wizard-field-group.hbs         |   2 +-
 .../components/wizard-field-number.hbs        |   2 +-
 .../components/wizard-field-time.hbs          |   2 +-
 .../templates/components/wizard-field-url.hbs |   2 +-
 .../components/wizard-similar-topics.hbs      |   2 +-
 .../components/wizard-time-input.hbs          |   2 +-
 assets/stylesheets/common/wizard-admin.scss   |  10 +
 assets/stylesheets/wizard/custom/base.scss    |   5 +
 config/locales/client.en.yml                  |   5 +
 controllers/custom_wizard/admin/manager.rb    |   2 +-
 controllers/custom_wizard/admin/wizard.rb     |   8 +-
 controllers/custom_wizard/steps.rb            |  94 +++++--
 controllers/custom_wizard/wizard.rb           |   5 +-
 coverage/.last_run.json                       |   2 +-
 extensions/wizard_field.rb                    |  40 ---
 extensions/wizard_step.rb                     |   4 -
 lib/custom_wizard/action.rb                   |  10 +-
 lib/custom_wizard/builder.rb                  | 263 +++++++++---------
 lib/custom_wizard/field.rb                    |  50 ++++
 lib/custom_wizard/step.rb                     |  56 ++++
 lib/custom_wizard/step_updater.rb             |   5 +-
 lib/custom_wizard/template.rb                 |  26 +-
 lib/custom_wizard/wizard.rb                   |  94 +++++--
 plugin.rb                                     |   5 +-
 .../custom_wizard/wizard_field_serializer.rb  |  63 ++++-
 .../custom_wizard/wizard_serializer.rb        |   2 +-
 .../custom_wizard/wizard_step_serializer.rb   |  62 ++++-
 spec/components/custom_wizard/action_spec.rb  |  28 +-
 spec/components/custom_wizard/builder_spec.rb |  66 ++++-
 spec/components/custom_wizard/field_spec.rb   |  19 ++
 spec/components/custom_wizard/step_spec.rb    |  36 +++
 spec/components/custom_wizard/wizard_spec.rb  |  70 ++++-
 spec/extensions/wizard_field_spec.rb          |  22 --
 spec/extensions/wizard_step_spec.rb           |  24 --
 spec/fixtures/condition/user_condition.json   |  17 ++
 .../condition/wizard_field_condition.json     |  17 ++
 spec/fixtures/field/field.json                |   1 +
 spec/fixtures/step/step.json                  |   1 +
 spec/fixtures/wizard.json                     |   2 +-
 .../custom_wizard/steps_controller_spec.rb    | 229 ++++++++++++++-
 .../wizard_field_serializer_spec.rb           |   5 +-
 .../custom_wizard/wizard_step_serializer.rb   |  59 ----
 .../wizard_step_serializer_spec.rb            |  67 +++++
 70 files changed, 1387 insertions(+), 573 deletions(-)
 delete mode 100644 extensions/wizard_field.rb
 delete mode 100644 extensions/wizard_step.rb
 create mode 100644 lib/custom_wizard/step.rb
 create mode 100644 spec/components/custom_wizard/step_spec.rb
 delete mode 100644 spec/extensions/wizard_field_spec.rb
 delete mode 100644 spec/extensions/wizard_step_spec.rb
 create mode 100644 spec/fixtures/condition/user_condition.json
 create mode 100644 spec/fixtures/condition/wizard_field_condition.json
 delete mode 100644 spec/serializers/custom_wizard/wizard_step_serializer.rb
 create mode 100644 spec/serializers/custom_wizard/wizard_step_serializer_spec.rb

diff --git a/assets/javascripts/discourse/components/wizard-custom-field.js.es6 b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
index 09896a6c..b5f6b0ee 100644
--- a/assets/javascripts/discourse/components/wizard-custom-field.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-field.js.es6
@@ -107,6 +107,40 @@ export default Component.extend(UndoChanges, {
     return this.setupTypeOutput(fieldType, options);
   },
 
+  @discourseComputed("step.index")
+  fieldConditionOptions(stepIndex) {
+    const options = {
+      inputTypes: "validation",
+      context: "field",
+      textSelection: "value",
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options.wizardFieldSelection = true;
+      options.wizardActionSelection = true;
+    }
+
+    return options;
+  },
+
+  @discourseComputed("step.index")
+  fieldIndexOptions(stepIndex) {
+    const options = {
+      context: "field",
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options.wizardFieldSelection = true;
+      options.wizardActionSelection = true;
+    }
+
+    return options;
+  },
+
   actions: {
     imageUploadDone(upload) {
       this.set("field.image", upload.url);
diff --git a/assets/javascripts/discourse/components/wizard-custom-step.js.es6 b/assets/javascripts/discourse/components/wizard-custom-step.js.es6
index 5715bbda..2a07dd65 100644
--- a/assets/javascripts/discourse/components/wizard-custom-step.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-step.js.es6
@@ -1,8 +1,27 @@
 import Component from "@ember/component";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
   classNames: "wizard-custom-step",
 
+  @discourseComputed("step.index")
+  stepConditionOptions(stepIndex) {
+    const options = {
+      inputTypes: "validation",
+      context: "step",
+      textSelection: "value",
+      userFieldSelection: true,
+      groupSelection: true,
+    };
+
+    if (stepIndex > 0) {
+      options["wizardFieldSelection"] = true;
+      options["wizardActionSelection"] = true;
+    }
+
+    return options;
+  },
+
   actions: {
     bannerUploadDone(upload) {
       this.set("step.banner", upload.url);
diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6
index 5d82a57d..c32809aa 100644
--- a/assets/javascripts/discourse/components/wizard-links.js.es6
+++ b/assets/javascripts/discourse/components/wizard-links.js.es6
@@ -38,6 +38,7 @@ export default Component.extend({
     const items = this.items;
     const item = items.findBy("id", itemId);
     items.removeObject(item);
+    item.set("index", newIndex);
     items.insertAt(newIndex, item);
     scheduleOnce("afterRender", this, () => this.applySortable());
   },
@@ -90,22 +91,14 @@ export default Component.extend({
 
       params.isNew = true;
 
-      let next = 1;
-
+      let index = 0;
       if (items.length) {
-        next =
-          Math.max.apply(
-            Math,
-            items.map((i) => {
-              let parts = i.id.split("_");
-              let lastPart = parts[parts.length - 1];
-              return isNaN(lastPart) ? 0 : lastPart;
-            })
-          ) + 1;
+        index = items.length;
       }
 
-      let id = `${itemType}_${next}`;
+      params.index = index;
 
+      let id = `${itemType}_${index + 1}`;
       if (itemType === "field") {
         id = `${this.parentId}_${id}`;
       }
diff --git a/assets/javascripts/discourse/lib/wizard-json.js.es6 b/assets/javascripts/discourse/lib/wizard-json.js.es6
index 4b0aaa3d..79da60cb 100644
--- a/assets/javascripts/discourse/lib/wizard-json.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-json.js.es6
@@ -23,54 +23,69 @@ function castCase(property, value) {
   return property.indexOf("_type") > -1 ? camelCase(value) : value;
 }
 
-function buildProperty(json, property, type) {
-  let value = json[property];
+function buildMappedProperty(value) {
+  let inputs = [];
 
-  if (mapped(property, type) && present(value) && value.constructor === Array) {
-    let inputs = [];
+  value.forEach((inputJson) => {
+    let input = {};
 
-    value.forEach((inputJson) => {
-      let input = {};
+    Object.keys(inputJson).forEach((inputKey) => {
+      if (inputKey === "pairs") {
+        let pairs = [];
+        let pairCount = inputJson.pairs.length;
 
-      Object.keys(inputJson).forEach((inputKey) => {
-        if (inputKey === "pairs") {
-          let pairs = [];
-          let pairCount = inputJson.pairs.length;
+        inputJson.pairs.forEach((pairJson) => {
+          let pair = {};
 
-          inputJson.pairs.forEach((pairJson) => {
-            let pair = {};
-
-            Object.keys(pairJson).forEach((pairKey) => {
-              pair[pairKey] = castCase(pairKey, pairJson[pairKey]);
-            });
-
-            pair.pairCount = pairCount;
-
-            pairs.push(EmberObject.create(pair));
+          Object.keys(pairJson).forEach((pairKey) => {
+            pair[pairKey] = castCase(pairKey, pairJson[pairKey]);
           });
 
-          input.pairs = pairs;
-        } else {
-          input[inputKey] = castCase(inputKey, inputJson[inputKey]);
-        }
-      });
+          pair.pairCount = pairCount;
 
-      inputs.push(EmberObject.create(input));
+          pairs.push(EmberObject.create(pair));
+        });
+
+        input.pairs = pairs;
+      } else {
+        input[inputKey] = castCase(inputKey, inputJson[inputKey]);
+      }
     });
 
-    return A(inputs);
-  } else {
-    return value;
-  }
+    inputs.push(EmberObject.create(input));
+  });
+
+  return A(inputs);
 }
 
-function buildObject(json, type) {
+function buildProperty(json, property, type, objectIndex) {
+  let value = json[property];
+  if (
+    property === "index" &&
+    (value === null || value === undefined) &&
+    (objectIndex !== null || objectIndex !== undefined)
+  ) {
+    return objectIndex;
+  }
+
+  if (
+    !mapped(property, type) ||
+    !present(value) ||
+    !value.constructor === Array
+  ) {
+    return value;
+  }
+
+  return buildMappedProperty(value);
+}
+
+function buildObject(json, type, objectIndex) {
   let props = {
     isNew: false,
   };
 
   Object.keys(json).forEach((prop) => {
-    props[prop] = buildProperty(json, prop, type);
+    props[prop] = buildProperty(json, prop, type, objectIndex);
   });
 
   return EmberObject.create(props);
@@ -80,8 +95,8 @@ function buildObjectArray(json, type) {
   let array = A();
 
   if (present(json)) {
-    json.forEach((objJson) => {
-      let object = buildObject(objJson, type);
+    json.forEach((objJson, objectIndex) => {
+      let object = buildObject(objJson, type, objectIndex);
 
       if (hasAdvancedProperties(object, type)) {
         object.set("showAdvanced", true);
@@ -94,9 +109,9 @@ function buildObjectArray(json, type) {
   return array;
 }
 
-function buildBasicProperties(json, type, props) {
+function buildBasicProperties(json, type, props, objectIndex = null) {
   listProperties(type).forEach((p) => {
-    props[p] = buildProperty(json, p, type);
+    props[p] = buildProperty(json, p, type, objectIndex);
 
     if (hasAdvancedProperties(json, type)) {
       props.showAdvanced = true;
@@ -142,12 +157,17 @@ function buildProperties(json) {
     props = buildBasicProperties(json, "wizard", props);
 
     if (present(json.steps)) {
-      json.steps.forEach((stepJson) => {
+      json.steps.forEach((stepJson, objectIndex) => {
         let stepProps = {
           isNew: false,
         };
 
-        stepProps = buildBasicProperties(stepJson, "step", stepProps);
+        stepProps = buildBasicProperties(
+          stepJson,
+          "step",
+          stepProps,
+          objectIndex
+        );
         stepProps.fields = buildObjectArray(stepJson.fields, "field");
 
         props.steps.pushObject(EmberObject.create(stepProps));
diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6
index effd8a5c..d196f387 100644
--- a/assets/javascripts/discourse/lib/wizard-schema.js.es6
+++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6
@@ -37,6 +37,7 @@ const wizard = {
 const step = {
   basic: {
     id: null,
+    index: null,
     title: null,
     key: null,
     banner: null,
@@ -44,9 +45,11 @@ const step = {
     required_data: null,
     required_data_message: null,
     permitted_params: null,
+    condition: null,
+    force_final: false,
   },
-  mapped: ["required_data", "permitted_params"],
-  advanced: ["required_data", "permitted_params"],
+  mapped: ["required_data", "permitted_params", "condition", "index"],
+  advanced: ["required_data", "permitted_params", "condition", "index"],
   required: ["id"],
   dependent: {},
   objectArrays: {
@@ -60,16 +63,18 @@ const step = {
 const field = {
   basic: {
     id: null,
+    index: null,
     label: null,
     image: null,
     description: null,
     required: null,
     key: null,
     type: null,
+    condition: null,
   },
   types: {},
-  mapped: ["prefill", "content"],
-  advanced: ["property", "key"],
+  mapped: ["prefill", "content", "condition", "index"],
+  advanced: ["property", "key", "condition", "index"],
   required: ["id", "type"],
   dependent: {},
   objectArrays: {},
diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6
index 7d97183f..e6a8408d 100644
--- a/assets/javascripts/discourse/models/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard.js.es6
@@ -131,11 +131,15 @@ const CustomWizard = EmberObject.extend({
     return result;
   },
 
-  buildMappedJson(inputs) {
-    if (!inputs || !inputs.length) {
+  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) => {
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
index f98623aa..18fd3fdb 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
@@ -31,4 +31,4 @@
   {{/if}}
 
   {{conditional-loading-spinner condition=refreshing}}
-{{/load-more}}
\ No newline at end of file
+{{/load-more}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
index cc26d808..9ee2f080 100644
--- a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
@@ -80,4 +80,4 @@
       {{/each}}
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/templates/components/custom-field-input.hbs
index 7e6598a0..205b1644 100644
--- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs
+++ b/assets/javascripts/discourse/templates/components/custom-field-input.hbs
@@ -60,4 +60,4 @@
   <td class="actions">
     {{d-button action="edit" icon="pencil-alt"}}
   </td>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs b/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
index 9f8563fc..ec2bcb76 100644
--- a/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-advanced-toggle.hbs
@@ -1,4 +1,4 @@
 {{d-button
   action="toggleAdvanced"
   label="admin.wizard.advanced"
-  class=toggleClass}}
\ No newline at end of file
+  class=toggleClass}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
index de97d44b..2f0b20ba 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@@ -75,7 +75,7 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.min_length"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{input
         type="number"
@@ -118,7 +118,7 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.file_types"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{input value=field.file_types class="medium"}}
     </div>
@@ -130,7 +130,7 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.limit"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{input type="number" value=field.limit class="small"}}
     </div>
@@ -142,7 +142,7 @@
     <div class="setting-label">
       <label>{{html-safe (i18n "admin.wizard.field.date_time_format.label")}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{input value=field.format class="medium"}}
       <label>{{html-safe (i18n "admin.wizard.field.date_time_format.instructions")}}</label>
@@ -155,7 +155,7 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.prefill"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=field.prefill
@@ -171,7 +171,7 @@
     <div class="setting-label">
       <label>{{i18n "admin.wizard.field.content"}}</label>
     </div>
-    
+
     <div class="setting-value">
       {{wizard-mapper
         inputs=field.content
@@ -187,7 +187,31 @@
 
   {{#if field.showAdvanced}}
     <div class="advanced-settings">
-      
+
+      <div class="setting full field-mapper-setting">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.condition"}}</label>
+        </div>
+
+        <div class="setting-value">
+          {{wizard-mapper
+            inputs=field.condition
+            options=fieldConditionOptions}}
+        </div>
+      </div>
+
+      <div class="setting full field-mapper-setting">
+        <div class="setting-label">
+          <label>{{i18n "admin.wizard.index"}}</label>
+        </div>
+
+        <div class="setting-value">
+          {{wizard-mapper
+            inputs=field.index
+            options=fieldIndexOptions}}
+        </div>
+      </div>
+
       {{#if isCategory}}
         <div class="setting">
           <div class="setting-label">
@@ -205,7 +229,7 @@
           </div>
         </div>
       {{/if}}
-      
+
       <div class="setting">
         <div class="setting-label">
           <label>{{i18n "admin.wizard.translation"}}</label>
@@ -218,7 +242,7 @@
             placeholderKey="admin.wizard.translation_placeholder"}}
         </div>
       </div>
-      
+
       {{#if validations}}
         {{wizard-realtime-validations field=field validations=validations}}
       {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
index e468c9ab..85adfe8a 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
@@ -37,7 +37,28 @@
 
 {{#if step.showAdvanced}}
   <div class="advanced-settings">
-    
+
+    <div class="setting full field-mapper-setting">
+      <div class="setting-label">
+        <label>{{i18n "admin.wizard.condition"}}</label>
+      </div>
+
+      <div class="setting-value">
+        {{wizard-mapper
+          inputs=step.condition
+          options=stepConditionOptions}}
+      </div>
+    </div>
+
+    <div class="setting full">
+      <div class="setting-label"></div>
+      <div class="setting-value force-final">
+        <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
+        {{input type="checkbox" checked=step.force_final}}
+        <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
+      </div>
+    </div>
+
     <div class="setting full field-mapper-setting">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.step.required_data.label"}}</label>
@@ -80,7 +101,7 @@
           )}}
       </div>
     </div>
-    
+
     <div class="setting">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.translation"}}</label>
@@ -92,7 +113,6 @@
           placeholderKey="admin.wizard.translation_placeholder"}}
       </div>
     </div>
-    
   </div>
 {{/if}}
 
@@ -105,8 +125,9 @@
 {{#each step.fields as |field|}}
   {{wizard-custom-field
     field=field
+    step=step
     currentFieldId=currentField.id
     fieldTypes=fieldTypes
     removeField="removeField"
     wizardFields=wizardFields}}
-{{/each}}
\ No newline at end of file
+{{/each}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs
index f0689f9e..7b610e2b 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs
@@ -9,4 +9,4 @@
       {{connectorLabel}}
     </span>
   {{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
index 272b0b58..ffb9eaf2 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs
@@ -32,4 +32,4 @@
 
 {{#if showRemove}}
   <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon "times"}}</a>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs
index 2ef7f2a3..32c4c26e 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-selector-type.hbs
@@ -1 +1 @@
-{{item.label}}
\ No newline at end of file
+{{item.label}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-message.hbs b/assets/javascripts/discourse/templates/components/wizard-message.hbs
index 4c48002a..380fc5b3 100644
--- a/assets/javascripts/discourse/templates/components/wizard-message.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-message.hbs
@@ -23,4 +23,4 @@
       {{documentation}}
     </a>
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
index a37f37a3..c657049d 100644
--- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
@@ -38,4 +38,4 @@
       </div>
     {{/if}}
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/javascripts/wizard/controllers/custom-step.js.es6 b/assets/javascripts/wizard/controllers/custom-step.js.es6
index bf415bc9..b44c0fca 100644
--- a/assets/javascripts/wizard/controllers/custom-step.js.es6
+++ b/assets/javascripts/wizard/controllers/custom-step.js.es6
@@ -4,14 +4,15 @@ import getUrl from "discourse-common/lib/get-url";
 export default StepController.extend({
   actions: {
     goNext(response) {
-      const next = this.get("step.next");
+      let nextStepId = response["next_step_id"];
+
       if (response.redirect_on_next) {
         window.location.href = response.redirect_on_next;
       } else if (response.refresh_required) {
-        const id = this.get("wizard.id");
-        window.location.href = getUrl(`/w/${id}/steps/${next}`);
+        const wizardId = this.get("wizard.id");
+        window.location.href = getUrl(`/w/${wizardId}/steps/${nextStepId}`);
       } else {
-        this.transitionToRoute("custom.step", next);
+        this.transitionToRoute("custom.step", nextStepId);
       }
     },
 
diff --git a/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
index 18fa9c70..fbbe7d8b 100644
--- a/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
+++ b/assets/javascripts/wizard/initializers/custom-wizard-step.js.es6
@@ -8,6 +8,9 @@ export default {
     const CustomWizard = requirejs(
       "discourse/plugins/discourse-custom-wizard/wizard/models/custom"
     ).default;
+    const updateCachedWizard = requirejs(
+      "discourse/plugins/discourse-custom-wizard/wizard/models/custom"
+    ).updateCachedWizard;
     const StepModel = requirejs("wizard/models/step").default;
     const StepComponent = requirejs("wizard/components/wizard-step").default;
     const ajax = requirejs("wizard/lib/ajax").ajax;
@@ -18,6 +21,7 @@ export default {
       "discourse/plugins/discourse-custom-wizard/wizard/lib/text-lite"
     ).cook;
     const { schedule } = requirejs("@ember/runloop");
+    const { alias, not } = requirejs("@ember/object/computed");
 
     StepModel.reopen({
       save() {
@@ -155,12 +159,17 @@ export default {
         this.sendAction("showMessage", message);
       }.observes("step.message"),
 
+      showNextButton: not("step.final"),
+      showDoneButton: alias("step.final"),
+
       advance() {
         this.set("saving", true);
         this.get("step")
           .save()
           .then((response) => {
-            if (this.get("finalStep")) {
+            updateCachedWizard(CustomWizard.build(response["wizard"]));
+
+            if (response["final"]) {
               CustomWizard.finished(response);
             } else {
               this.sendAction("goNext", response);
@@ -178,7 +187,6 @@ export default {
         },
 
         done() {
-          this.set("finalStep", true);
           this.send("nextStep");
         },
 
diff --git a/assets/javascripts/wizard/models/custom.js.es6 b/assets/javascripts/wizard/models/custom.js.es6
index 4e214eed..31a403da 100644
--- a/assets/javascripts/wizard/models/custom.js.es6
+++ b/assets/javascripts/wizard/models/custom.js.es6
@@ -31,63 +31,45 @@ CustomWizard.reopenClass({
     }
     window.location.href = getUrl(url);
   },
-});
 
-export function findCustomWizard(wizardId, params = {}) {
-  let url = `/w/${wizardId}`;
-
-  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, cache: false, dataType: "json" }).then((result) => {
-    const wizard = result;
-    if (!wizard) {
+  build(wizardJson) {
+    if (!wizardJson) {
       return null;
     }
 
-    if (!wizard.completed) {
-      wizard.steps = wizard.steps.map((step) => {
-        const stepObj = Step.create(step);
+    if (!wizardJson.completed && wizardJson.steps) {
+      wizardJson.steps = wizardJson.steps
+        .map((step) => {
+          const stepObj = Step.create(step);
 
-        stepObj.fields.sort((a, b) => {
-          return parseFloat(a.number) - parseFloat(b.number);
+          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) => WizardField.create(f));
+
+          return stepObj;
+        })
+        .sort((a, b) => {
+          return parseFloat(a.index) - parseFloat(b.index);
         });
-
-        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) => WizardField.create(f));
-
-        return stepObj;
-      });
     }
 
-    if (wizard.categories) {
+    if (wizardJson.categories) {
       let subcatMap = {};
       let categoriesById = {};
-      let categories = wizard.categories.map((c) => {
+      let categories = wizardJson.categories.map((c) => {
         if (c.parent_category_id) {
           subcatMap[c.parent_category_id] =
             subcatMap[c.parent_category_id] || [];
@@ -116,12 +98,47 @@ export function findCustomWizard(wizardId, params = {}) {
       Discourse.Site.currentProp("categoriesById", categoriesById);
       Discourse.Site.currentProp(
         "uncategorized_category_id",
-        wizard.uncategorized_category_id
+        wizardJson.uncategorized_category_id
       );
     }
 
-    return CustomWizard.create(wizard);
+    return CustomWizard.create(wizardJson);
+  },
+});
+
+export function findCustomWizard(wizardId, params = {}) {
+  let url = `/w/${wizardId}`;
+
+  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, cache: false, dataType: "json" }).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;
diff --git a/assets/javascripts/wizard/routes/custom-index.js.es6 b/assets/javascripts/wizard/routes/custom-index.js.es6
index 05f2f2bf..a8abc152 100644
--- a/assets/javascripts/wizard/routes/custom-index.js.es6
+++ b/assets/javascripts/wizard/routes/custom-index.js.es6
@@ -1,22 +1,19 @@
+import { getCachedWizard } from "../models/custom";
+
 export default Ember.Route.extend({
   beforeModel() {
-    const appModel = this.modelFor("custom");
-    if (
-      appModel &&
-      appModel.permitted &&
-      !appModel.completed &&
-      appModel.start
-    ) {
-      this.replaceWith("custom.step", appModel.start);
+    const wizard = getCachedWizard();
+    if (wizard && wizard.permitted && !wizard.completed && wizard.start) {
+      this.replaceWith("custom.step", wizard.start);
     }
   },
 
   model() {
-    return this.modelFor("custom");
+    return getCachedWizard();
   },
 
   setupController(controller, model) {
-    if (model) {
+    if (model && model.id) {
       const completed = model.get("completed");
       const permitted = model.get("permitted");
       const wizardId = model.get("id");
diff --git a/assets/javascripts/wizard/routes/custom-step.js.es6 b/assets/javascripts/wizard/routes/custom-step.js.es6
index 3cb5db6e..8088727a 100644
--- a/assets/javascripts/wizard/routes/custom-step.js.es6
+++ b/assets/javascripts/wizard/routes/custom-step.js.es6
@@ -1,28 +1,33 @@
 import WizardI18n from "../lib/wizard-i18n";
+import { getCachedWizard } from "../models/custom";
 
 export default Ember.Route.extend({
-  model(params) {
-    const appModel = this.modelFor("custom");
-    const allSteps = appModel.steps;
-    if (allSteps) {
-      const step = allSteps.findBy("id", params.step_id);
-      return step ? step : allSteps[0];
-    }
+  beforeModel() {
+    this.set("wizard", getCachedWizard());
+  },
 
-    return appModel;
+  model(params) {
+    const wizard = this.wizard;
+
+    if (wizard && wizard.steps) {
+      const step = wizard.steps.findBy("id", params.step_id);
+      return step ? step : wizard.steps[0];
+    } else {
+      return wizard;
+    }
   },
 
   afterModel(model) {
     if (model.completed) {
       return this.transitionTo("index");
     }
-    return model.set("wizardId", this.modelFor("custom").id);
+    return model.set("wizardId", this.wizard.id);
   },
 
   setupController(controller, model) {
     let props = {
       step: model,
-      wizard: this.modelFor("custom"),
+      wizard: this.wizard,
     };
 
     if (!model.permitted) {
diff --git a/assets/javascripts/wizard/routes/custom.js.es6 b/assets/javascripts/wizard/routes/custom.js.es6
index 041ea967..367fa36b 100644
--- a/assets/javascripts/wizard/routes/custom.js.es6
+++ b/assets/javascripts/wizard/routes/custom.js.es6
@@ -1,6 +1,6 @@
 /* eslint no-undef: 0*/
 
-import { findCustomWizard } from "../models/custom";
+import { findCustomWizard, updateCachedWizard } from "../models/custom";
 import { ajax } from "wizard/lib/ajax";
 
 export default Ember.Route.extend({
@@ -12,7 +12,9 @@ export default Ember.Route.extend({
     return findCustomWizard(params.wizard_id, this.get("queryParams"));
   },
 
-  afterModel() {
+  afterModel(model) {
+    updateCachedWizard(model);
+
     return ajax({
       url: `/site/settings`,
       type: "GET",
@@ -25,11 +27,11 @@ export default Ember.Route.extend({
     const background = model ? model.get("background") : "AliceBlue";
     Ember.run.scheduleOnce("afterRender", this, function () {
       $("body.custom-wizard").css("background", background);
-      if (model) {
-        $("#custom-wizard-main").addClass(model.get("id").dasherize());
+
+      if (model && model.id) {
+        $("#custom-wizard-main").addClass(model.id.dasherize());
       }
     });
-
     controller.setProperties({
       customWizard: true,
       logoUrl: Wizard.SiteSettings.logo_small,
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs b/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
index 8cbc2b3e..053e0218 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-checkbox.hbs
@@ -1 +1 @@
-{{input type="checkbox" id=field.id checked=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="checkbox" id=field.id checked=field.value tabindex=field.tabindex}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-date-time.hbs b/assets/javascripts/wizard/templates/components/wizard-field-date-time.hbs
index 0b4f7916..dae4523d 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-date-time.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-date-time.hbs
@@ -2,4 +2,4 @@
   date=dateTime
   onChange=(action "onChange")
   tabindex=field.tabindex
-}}
\ No newline at end of file
+}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-date.hbs b/assets/javascripts/wizard/templates/components/wizard-field-date.hbs
index 7b914807..4ac6571b 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-date.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-date.hbs
@@ -2,4 +2,4 @@
   date=date
   onChange=(action "onChange")
   tabindex=field.tabindex
-}}
\ No newline at end of file
+}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
index fbb68721..7ce4c298 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
@@ -5,4 +5,4 @@
   tabindex=field.tabindex
   options=(hash
     none="select_kit.default_header_text"
-  )}}
\ No newline at end of file
+  )}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-group.hbs b/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
index 0c3b102d..92c08e2b 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-group.hbs
@@ -7,4 +7,4 @@
   onChange=(action (mut field.value))
   options=(hash
     none="group.select"
-  )}}
\ No newline at end of file
+  )}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-number.hbs b/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
index 8704dac0..f5d6543c 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-number.hbs
@@ -1 +1 @@
-{{input type="number" step="0.01" id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="number" step="0.01" id=field.id value=field.value tabindex=field.tabindex}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-time.hbs b/assets/javascripts/wizard/templates/components/wizard-field-time.hbs
index dafa9e59..d4cc425a 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-time.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-time.hbs
@@ -2,4 +2,4 @@
   date=time
   onChange=(action "onChange")
   tabindex=field.tabindex
-}}
\ No newline at end of file
+}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-field-url.hbs b/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
index e9015010..c7e1a508 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field-url.hbs
@@ -1 +1 @@
-{{input type="text" id=field.id value=field.value tabindex=field.tabindex}}
\ No newline at end of file
+{{input type="text" id=field.id value=field.value tabindex=field.tabindex}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
index e3163517..d1ee1fa1 100644
--- a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
@@ -8,4 +8,4 @@
   <a role="button" class="show-topics" {{action "toggleShowTopics"}}>
     {{wizard-i18n "realtime_validations.similar_topics.show"}}
   </a>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/javascripts/wizard/templates/components/wizard-time-input.hbs b/assets/javascripts/wizard/templates/components/wizard-time-input.hbs
index 6207851b..73fa4968 100644
--- a/assets/javascripts/wizard/templates/components/wizard-time-input.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-time-input.hbs
@@ -10,4 +10,4 @@
     autoInsertNoneItem=false
     translatedFilterPlaceholder="--:--"
   )
-}}
\ No newline at end of file
+}}
diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/wizard-admin.scss
index d7d00795..3c4b78da 100644
--- a/assets/stylesheets/common/wizard-admin.scss
+++ b/assets/stylesheets/common/wizard-admin.scss
@@ -303,6 +303,16 @@
         max-width: 250px !important;
         min-width: 250px !important;
       }
+
+      &.force-final {
+        padding: 1em;
+        background-color: var(--primary-very-low);
+
+        label,
+        span {
+          font-size: 1em;
+        }
+      }
     }
 
     &.full,
diff --git a/assets/stylesheets/wizard/custom/base.scss b/assets/stylesheets/wizard/custom/base.scss
index 7aa884e9..39ab061a 100644
--- a/assets/stylesheets/wizard/custom/base.scss
+++ b/assets/stylesheets/wizard/custom/base.scss
@@ -50,6 +50,11 @@ textarea {
     border-color: var(--danger);
     box-shadow: shadow("focus-danger");
   }
+
+  &[type="checkbox"] {
+    margin-bottom: 0;
+    margin-right: 10px;
+  }
 }
 
 .spinner {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1ebe3a83..0c364853 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -56,6 +56,8 @@ en:
         undo: "Undo"
         clear: "Clear"
         select_type: "Select a type"
+        condition: "Condition"
+        index: "Index"
         
         message:
           wizard:
@@ -153,6 +155,9 @@ en:
             not_permitted_message: "Message shown when required data not present"
           permitted_params:
             label: "Params"
+          force_final:
+            label: "Conditional Final Step"
+            description: "Display this step as the final step if conditions on later steps have not passed when the user reaches this step."
         
         field:
           header: "Fields"
diff --git a/controllers/custom_wizard/admin/manager.rb b/controllers/custom_wizard/admin/manager.rb
index 1596c233..2277de48 100644
--- a/controllers/custom_wizard/admin/manager.rb
+++ b/controllers/custom_wizard/admin/manager.rb
@@ -41,7 +41,7 @@ class CustomWizard::AdminManagerController < CustomWizard::AdminController
     end
 
     begin
-      template_json = JSON.parse file
+      template_json = JSON.parse(file)
     rescue JSON::ParserError
       return render_error(I18n.t('wizard.import.error.invalid_json'))
     end
diff --git a/controllers/custom_wizard/admin/wizard.rb b/controllers/custom_wizard/admin/wizard.rb
index 658f6682..0af55d95 100644
--- a/controllers/custom_wizard/admin/wizard.rb
+++ b/controllers/custom_wizard/admin/wizard.rb
@@ -37,7 +37,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
     wizard_id = template.save(create: params[:create])
 
     if template.errors.any?
-      render json: failed_json.merge(errors: result.errors.full_messages)
+      render json: failed_json.merge(errors: template.errors.full_messages)
     else
       render json: success_json.merge(wizard_id: wizard_id)
     end
@@ -83,15 +83,19 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
       permitted: mapped_params,
       steps: [
         :id,
+        :index,
         :title,
         :key,
         :banner,
         :raw_description,
         :required_data_message,
+        :force_final,
         required_data: mapped_params,
         permitted_params: mapped_params,
+        condition: mapped_params,
         fields: [
           :id,
+          :index,
           :label,
           :image,
           :description,
@@ -107,6 +111,8 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
           :property,
           prefill: mapped_params,
           content: mapped_params,
+          condition: mapped_params,
+          index: mapped_params,
           validations: {},
         ]
       ],
diff --git a/controllers/custom_wizard/steps.rb b/controllers/custom_wizard/steps.rb
index 9c6eec47..277b94b2 100644
--- a/controllers/custom_wizard/steps.rb
+++ b/controllers/custom_wizard/steps.rb
@@ -4,31 +4,67 @@ class CustomWizard::StepsController < ::ApplicationController
   before_action :ensure_can_update
 
   def update
-    params.require(:step_id)
-    params.require(:wizard_id)
-
-    wizard = @builder.build
-    step = wizard.steps.select { |s| s.id == update_params[:step_id] }.first
-
-    raise Discourse::InvalidParameters.new(:step_id) if !step
-
     update = update_params.to_h
 
     update[:fields] = {}
     if params[:fields]
-      field_ids = step.fields.map(&:id)
+      field_ids = @step_template['fields'].map { |f| f['id'] }
       params[:fields].each do |k, v|
         update[:fields][k] = v if field_ids.include? k
       end
     end
 
-    updater = wizard.create_updater(update[:step_id], update[:fields])
+    @builder.build
+
+    updater = @builder.wizard.create_updater(update[:step_id], update[:fields])
     updater.update
+    @result = updater.result
 
     if updater.success?
-      result = success_json
-      result.merge!(updater.result) if updater.result
+      wizard_id = update_params[:wizard_id]
+      builder = CustomWizard::Builder.new(wizard_id, current_user)
+      @wizard = builder.build
+
+      current_step = @wizard.find_step(update[:step_id])
+      current_submission = @wizard.current_submission
+      result = {}
+
+      if current_step.conditional_final_step && !current_step.last_step
+        current_step.force_final = true
+      end
+
+      if current_step.final?
+        builder.template.actions.each do |action_template|
+          if action_template['run_after'] === 'wizard_completion'
+            CustomWizard::Action.new(
+              action: action_template,
+              wizard: @wizard,
+              data: current_submission
+            ).perform
+          end
+        end
+
+        @wizard.save_submission(current_submission)
+
+        if redirect = get_redirect
+          updater.result[:redirect_on_complete] = redirect
+        end
+
+        @wizard.final_cleanup!
+
+        result[:final] = true
+      else
+        result[:final] = false
+        result[:next_step_id] = current_step.next.id
+      end
+
+      result.merge!(updater.result) if updater.result.present?
       result[:refresh_required] = true if updater.refresh_required?
+      result[:wizard] = ::CustomWizard::WizardSerializer.new(
+        @wizard,
+        scope: Guardian.new(current_user),
+        root: false
+      ).as_json
 
       render json: result
     else
@@ -43,21 +79,31 @@ class CustomWizard::StepsController < ::ApplicationController
   private
 
   def ensure_can_update
-    @builder = CustomWizard::Builder.new(
-      update_params[:wizard_id].underscore,
-      current_user
-    )
+    @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?
 
-    if @builder.nil?
-      raise Discourse::InvalidParameters.new(:wizard_id)
-    end
-
-    if !@builder.wizard || !@builder.wizard.can_access?
-      raise Discourse::InvalidAccess.new
-    end
+    @step_template = @builder.template.steps.select do |s|
+      s['id'] == update_params[:step_id]
+    end.first
+    raise Discourse::InvalidParameters.new(:step_id) if !@step_template
+    raise Discourse::InvalidAccess.new if !@builder.check_condition(@step_template)
   end
 
   def update_params
-    params.permit(:wizard_id, :step_id)
+    @update_params || begin
+      params.require(:step_id)
+      params.require(:wizard_id)
+      params.permit(:wizard_id, :step_id).transform_values { |v| v.underscore }
+    end
+  end
+
+  def get_redirect
+    return @result[:redirect_on_next] if @result[:redirect_on_next].present?
+
+    current_submission = @wizard.current_submission
+    return nil unless current_submission.present?
+    ## route_to set by actions, redirect_on_complete set by actions, redirect_to set at wizard entry
+    current_submission[:route_to] || current_submission[:redirect_on_complete] || current_submission[:redirect_to]
   end
 end
diff --git a/controllers/custom_wizard/wizard.rb b/controllers/custom_wizard/wizard.rb
index 5cbeb6e3..73c1f592 100644
--- a/controllers/custom_wizard/wizard.rb
+++ b/controllers/custom_wizard/wizard.rb
@@ -65,10 +65,7 @@ class CustomWizard::WizardController < ::ApplicationController
         result.merge!(redirect_to: submission['redirect_to'])
       end
 
-      if user.custom_fields['redirect_to_wizard'] === wizard.id
-        user.custom_fields.delete('redirect_to_wizard')
-        user.save_custom_fields(true)
-      end
+      wizard.final_cleanup!
     end
 
     render json: result
diff --git a/coverage/.last_run.json b/coverage/.last_run.json
index 42d46659..3e7f27f6 100644
--- a/coverage/.last_run.json
+++ b/coverage/.last_run.json
@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 89.56
+    "line": 90.52
   }
 }
diff --git a/extensions/wizard_field.rb b/extensions/wizard_field.rb
deleted file mode 100644
index 2042872f..00000000
--- a/extensions/wizard_field.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-module CustomWizardFieldExtension
-  attr_reader :raw,
-              :label,
-              :description,
-              :image,
-              :key,
-              :validations,
-              :min_length,
-              :max_length,
-              :char_counter,
-              :file_types,
-              :format,
-              :limit,
-              :property,
-              :content,
-              :number
-
-  def initialize(attrs)
-    super
-    @raw = attrs || {}
-    @description = attrs[:description]
-    @image = attrs[:image]
-    @key = attrs[:key]
-    @validations = attrs[:validations]
-    @min_length = attrs[:min_length]
-    @max_length = attrs[:max_length]
-    @char_counter = attrs[:char_counter]
-    @file_types = attrs[:file_types]
-    @format = attrs[:format]
-    @limit = attrs[:limit]
-    @property = attrs[:property]
-    @content = attrs[:content]
-    @number = attrs[:number]
-  end
-
-  def label
-    @label ||= PrettyText.cook(@raw[:label])
-  end
-end
diff --git a/extensions/wizard_step.rb b/extensions/wizard_step.rb
deleted file mode 100644
index 4ae0224c..00000000
--- a/extensions/wizard_step.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module CustomWizardStepExtension
-  attr_accessor :title, :description, :key, :permitted, :permitted_message
-end
diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index 8f09d46a..fc436f3b 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -6,12 +6,12 @@ class CustomWizard::Action
                 :guardian,
                 :result
 
-  def initialize(params)
-    @wizard = params[:wizard]
-    @action = params[:action]
-    @user = params[:user]
+  def initialize(opts)
+    @wizard = opts[:wizard]
+    @action = opts[:action]
+    @user = @wizard.user
     @guardian = Guardian.new(@user)
-    @data = params[:data]
+    @data = opts[:data]
     @log = []
     @result = CustomWizard::ActionResult.new
   end
diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb
index 9a2d1060..daa73476 100644
--- a/lib/custom_wizard/builder.rb
+++ b/lib/custom_wizard/builder.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 class CustomWizard::Builder
-  attr_accessor :wizard, :updater, :submissions
+  attr_accessor :wizard, :updater, :template
 
   def initialize(wizard_id, user = nil)
-    template = CustomWizard::Template.find(wizard_id)
-    return nil if template.blank?
-
-    @wizard = CustomWizard::Wizard.new(template, user)
-    @steps = template['steps'] || []
-    @actions = template['actions'] || []
-    @submissions = @wizard.submissions
+    @template = CustomWizard::Template.create(wizard_id)
+    return nil if @template.nil?
+    @wizard = CustomWizard::Wizard.new(template.data, user)
   end
 
   def self.sorted_handlers
@@ -28,7 +24,7 @@ class CustomWizard::Builder
   def mapper
     CustomWizard::Mapper.new(
       user: @wizard.user,
-      data: @submissions.last
+      data: @wizard.current_submission
     )
   end
 
@@ -38,103 +34,38 @@ class CustomWizard::Builder
 
     build_opts[:reset] = build_opts[:reset] || @wizard.restart_on_revisit
 
-    @steps.each do |step_template|
+    @template.steps.each do |step_template|
+      next if !check_condition(step_template)
+
       @wizard.append_step(step_template['id']) do |step|
-        step.permitted = true
+        step = check_if_permitted(step, step_template)
+        next if !step.permitted
 
-        if step_template['required_data']
-          step = ensure_required_data(step, step_template)
-        end
-
-        if !step.permitted
-          if step_template['required_data_message']
-            step.permitted_message = step_template['required_data_message']
-          end
-          next
-        end
-
-        step.title = step_template['title'] if step_template['title']
-        step.banner = step_template['banner'] if step_template['banner']
-        step.key = step_template['key'] if step_template['key']
-
-        if step_template['description']
-          step.description = mapper.interpolate(
-            step_template['description'],
-            user: true,
-            value: true
-          )
-        end
-
-        if permitted_params = step_template['permitted_params']
-          save_permitted_params(permitted_params, params)
-        end
-
-        if step_template['fields'] && step_template['fields'].length
-          step_template['fields'].each_with_index do |field_template, index|
-            append_field(step, step_template, field_template, build_opts, index)
-          end
-        end
+        save_permitted_params(step_template, params)
+        step = add_step_attributes(step, step_template)
+        step = append_step_fields(step, step_template, build_opts)
 
         step.on_update do |updater|
           @updater = updater
-          user = @wizard.user
+          @submission = (@wizard.current_submission || {})
+            .merge(@updater.submission)
+            .with_indifferent_access
 
-          updater.validate
+          @updater.validate
+          next if @updater.errors.any?
 
-          next if updater.errors.any?
+          apply_step_handlers
+          next if @updater.errors.any?
 
-          CustomWizard::Builder.step_handlers.each do |handler|
-            if handler[:wizard_id] == @wizard.id
-              handler[:block].call(self)
-            end
-          end
+          run_step_actions
 
-          next if updater.errors.any?
-
-          submission = updater.submission
-
-          if current_submission = @wizard.current_submission
-            submission = current_submission.merge(submission)
-          end
-
-          final_step = updater.step.next.nil?
-
-          if @actions.present?
-            @actions.each do |action|
-
-              if (action['run_after'] === updater.step.id) ||
-                 (final_step && (!action['run_after'] || (action['run_after'] === 'wizard_completion')))
-
-                CustomWizard::Action.new(
-                  wizard: @wizard,
-                  action: action,
-                  user: user,
-                  data: submission
-                ).perform
-              end
-            end
-          end
-
-          if updater.errors.empty?
-            if route_to = submission['route_to']
-              submission.delete('route_to')
+          if @updater.errors.empty?
+            if route_to = @submission['route_to']
+              @submission.delete('route_to')
             end
 
-            if @wizard.save_submissions
-              save_submissions(submission, final_step)
-            end
-
-            if final_step
-              if @wizard.id == @wizard.user.custom_fields['redirect_to_wizard']
-                @wizard.user.custom_fields.delete('redirect_to_wizard')
-                @wizard.user.save_custom_fields(true)
-              end
-
-              redirect_url = route_to || submission['redirect_on_complete'] || submission["redirect_to"]
-              updater.result[:redirect_on_complete] = redirect_url
-            elsif route_to
-              updater.result[:redirect_on_next] = route_to
-            end
+            @wizard.save_submission(@submission)
+            @updater.result[:redirect_on_next] = route_to if route_to
 
             true
           else
@@ -144,25 +75,21 @@ class CustomWizard::Builder
       end
     end
 
+    @wizard.update_step_order!
     @wizard
   end
 
-  def append_field(step, step_template, field_template, build_opts, index)
+  def append_field(step, step_template, field_template, build_opts)
     params = {
       id: field_template['id'],
       type: field_template['type'],
-      required: field_template['required'],
-      number: index + 1
+      required: field_template['required']
     }
 
-    params[:label] = field_template['label'] if field_template['label']
-    params[:description] = field_template['description'] if field_template['description']
-    params[:image] = field_template['image'] if field_template['image']
-    params[:key] = field_template['key'] if field_template['key']
-    params[:validations] = field_template['validations'] if field_template['validations']
-    params[:min_length] = field_template['min_length'] if field_template['min_length']
-    params[:max_length] = field_template['max_length'] if field_template['max_length']
-    params[:char_counter] = field_template['char_counter'] if field_template['char_counter']
+    %w(label description image key validations min_length max_length char_counter).each do |key|
+      params[key.to_sym] = field_template[key] if field_template[key]
+    end
+
     params[:value] = prefill_field(field_template, step_template)
 
     if !build_opts[:reset] && (submission = @wizard.current_submission)
@@ -209,7 +136,7 @@ class CustomWizard::Builder
       content = CustomWizard::Mapper.new(
         inputs: content_inputs,
         user: @wizard.user,
-        data: @submissions.last,
+        data: @wizard.current_submission,
         opts: {
           with_type: true
         }
@@ -240,6 +167,16 @@ class CustomWizard::Builder
       end
     end
 
+    if field_template['index'].present?
+      index = CustomWizard::Mapper.new(
+        inputs: field_template['index'],
+        user: @wizard.user,
+        data: @wizard.current_submission
+      ).perform
+
+      params[:index] = index.to_i unless index.nil?
+    end
+
     field = step.add_field(params)
   end
 
@@ -248,41 +185,91 @@ class CustomWizard::Builder
       CustomWizard::Mapper.new(
         inputs: prefill,
         user: @wizard.user,
-        data: @submissions.last
+        data: @wizard.current_submission
       ).perform
     end
   end
 
+  def check_condition(template)
+    if template['condition'].present?
+      CustomWizard::Mapper.new(
+        inputs: template['condition'],
+        user: @wizard.user,
+        data: @wizard.current_submission
+      ).perform
+    else
+      true
+    end
+  end
+
+  def check_if_permitted(step, step_template)
+    step.permitted = true
+
+    if step_template['required_data']
+      step = ensure_required_data(step, step_template)
+    end
+
+    if !step.permitted
+      if step_template['required_data_message']
+        step.permitted_message = step_template['required_data_message']
+      end
+    end
+
+    step
+  end
+
+  def add_step_attributes(step, step_template)
+    %w(index title banner key force_final).each do |attr|
+      step.send("#{attr}=", step_template[attr]) if step_template[attr]
+    end
+
+    if step_template['description']
+      step.description = mapper.interpolate(
+        step_template['description'],
+        user: true,
+        value: true
+      )
+    end
+
+    step
+  end
+
+  def append_step_fields(step, step_template, build_opts)
+    if step_template['fields'] && step_template['fields'].length
+      step_template['fields'].each do |field_template|
+        next if !check_condition(field_template)
+        append_field(step, step_template, field_template, build_opts)
+      end
+    end
+
+    step.update_field_order!
+    step
+  end
+
   def standardise_boolean(value)
     ActiveRecord::Type::Boolean.new.cast(value)
   end
 
-  def save_submissions(submission, final_step)
-    if final_step
-      submission['submitted_at'] = Time.now.iso8601
-    end
+  def save_permitted_params(step_template, params)
+    return unless step_template['permitted_params'].present?
 
-    if submission.present?
-      @submissions.pop(1) if @wizard.unfinished?
-      @submissions.push(submission)
-      @wizard.set_submissions(@submissions)
-    end
-  end
-
-  def save_permitted_params(permitted_params, params)
+    permitted_params = step_template['permitted_params']
     permitted_data = {}
+    submission_key = nil
+    params_key = nil
+    submission = @wizard.current_submission || {}
 
     permitted_params.each do |pp|
       pair = pp['pairs'].first
       params_key = pair['key'].to_sym
       submission_key = pair['value'].to_sym
-      permitted_data[submission_key] = params[params_key] if params[params_key]
+
+      if submission_key && params_key
+        submission[submission_key] = params[params_key]
+      end
     end
 
-    if permitted_data.present?
-      current_data = @submissions.last || {}
-      save_submissions(current_data.merge(permitted_data), false)
-    end
+    @wizard.save_submission(submission)
   end
 
   def ensure_required_data(step, step_template)
@@ -291,13 +278,13 @@ class CustomWizard::Builder
         pair['key'].present? && pair['value'].present?
       end
 
-      if pairs.any? && !@submissions.last
+      if pairs.any? && !@wizard.current_submission
         step.permitted = false
         break
       end
 
       pairs.each do |pair|
-        pair['key'] = @submissions.last[pair['key']]
+        pair['key'] = @wizard.current_submission[pair['key']]
       end
 
       if !mapper.validate_pairs(pairs)
@@ -308,4 +295,26 @@ class CustomWizard::Builder
 
     step
   end
+
+  def apply_step_handlers
+    CustomWizard::Builder.step_handlers.each do |handler|
+      if handler[:wizard_id] == @wizard.id
+        handler[:block].call(self)
+      end
+    end
+  end
+
+  def run_step_actions
+    if @template.actions.present?
+      @template.actions.each do |action_template|
+        if action_template['run_after'] === updater.step.id
+          CustomWizard::Action.new(
+            action: action_template,
+            wizard: @wizard,
+            data: @submission
+          ).perform
+        end
+      end
+    end
+  end
 end
diff --git a/lib/custom_wizard/field.rb b/lib/custom_wizard/field.rb
index 1ddbcd3b..51e3d4de 100644
--- a/lib/custom_wizard/field.rb
+++ b/lib/custom_wizard/field.rb
@@ -1,5 +1,55 @@
 # frozen_string_literal: true
+
 class CustomWizard::Field
+  include ActiveModel::SerializerSupport
+
+  attr_reader :raw,
+              :id,
+              :type,
+              :required,
+              :value,
+              :label,
+              :description,
+              :image,
+              :key,
+              :validations,
+              :min_length,
+              :max_length,
+              :char_counter,
+              :file_types,
+              :format,
+              :limit,
+              :property,
+              :content
+
+  attr_accessor :index,
+                :step
+
+  def initialize(attrs)
+    @raw = attrs || {}
+    @id = attrs[:id]
+    @index = attrs[:index]
+    @type = attrs[:type]
+    @required = !!attrs[:required]
+    @value = attrs[:value]
+    @description = attrs[:description]
+    @image = attrs[:image]
+    @key = attrs[:key]
+    @validations = attrs[:validations]
+    @min_length = attrs[:min_length]
+    @max_length = attrs[:max_length]
+    @char_counter = attrs[:char_counter]
+    @file_types = attrs[:file_types]
+    @format = attrs[:format]
+    @limit = attrs[:limit]
+    @property = attrs[:property]
+    @content = attrs[:content]
+  end
+
+  def label
+    @label ||= PrettyText.cook(@raw[:label])
+  end
+
   def self.types
     @types ||= {
       text: {
diff --git a/lib/custom_wizard/step.rb b/lib/custom_wizard/step.rb
new file mode 100644
index 00000000..5ffd8024
--- /dev/null
+++ b/lib/custom_wizard/step.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class CustomWizard::Step
+  include ActiveModel::SerializerSupport
+
+  attr_reader :id,
+              :updater
+
+  attr_accessor :index,
+                :title,
+                :description,
+                :key,
+                :permitted,
+                :permitted_message,
+                :fields,
+                :next,
+                :previous,
+                :banner,
+                :disabled,
+                :description_vars,
+                :last_step,
+                :force_final,
+                :conditional_final_step,
+                :wizard
+
+  def initialize(id)
+    @id = id
+    @fields = []
+  end
+
+  def add_field(attrs)
+    field = ::CustomWizard::Field.new(attrs)
+    field.index = (@fields.size == 1 ? 0 : @fields.size) if field.index.nil?
+    field.step = self
+    @fields << field
+    field
+  end
+
+  def has_fields?
+    @fields.present?
+  end
+
+  def on_update(&block)
+    @updater = block
+  end
+
+  def update_field_order!
+    @fields.sort_by!(&:index)
+  end
+
+  def final?
+    return true if force_final && conditional_final_step
+    return true if last_step
+    false
+  end
+end
diff --git a/lib/custom_wizard/step_updater.rb b/lib/custom_wizard/step_updater.rb
index 3a9d65f1..ab86f3fa 100644
--- a/lib/custom_wizard/step_updater.rb
+++ b/lib/custom_wizard/step_updater.rb
@@ -2,14 +2,15 @@
 class CustomWizard::StepUpdater
   include ActiveModel::Model
 
-  attr_accessor :refresh_required, :submission, :result, :step
+  attr_accessor :refresh_required, :result
+  attr_reader :step, :submission
 
   def initialize(current_user, wizard, step, submission)
     @current_user = current_user
     @wizard = wizard
     @step = step
     @refresh_required = false
-    @submission = submission.to_h.with_indifferent_access
+    @submission = submission.with_indifferent_access
     @result = {}
   end
 
diff --git a/lib/custom_wizard/template.rb b/lib/custom_wizard/template.rb
index 91b97f73..b0f786c9 100644
--- a/lib/custom_wizard/template.rb
+++ b/lib/custom_wizard/template.rb
@@ -4,10 +4,14 @@ class CustomWizard::Template
   include HasErrors
 
   attr_reader :data,
-              :opts
+              :opts,
+              :steps,
+              :actions
 
   def initialize(data)
     @data = data
+    @steps = data['steps'] || []
+    @actions = data['actions'] || []
   end
 
   def save(opts = {})
@@ -31,6 +35,14 @@ class CustomWizard::Template
     new(data).save(opts)
   end
 
+  def self.create(wizard_id)
+    if data = find(wizard_id)
+      new(data)
+    else
+      nil
+    end
+  end
+
   def self.find(wizard_id)
     PluginStore.get(CustomWizard::PLUGIN_NAME, wizard_id)
   end
@@ -88,6 +100,12 @@ class CustomWizard::Template
       if step[:raw_description]
         step[:description] = PrettyText.cook(step[:raw_description])
       end
+
+      remove_non_mapped_index(step)
+
+      step[:fields].each do |field|
+        remove_non_mapped_index(field)
+      end
     end
   end
 
@@ -118,4 +136,10 @@ class CustomWizard::Template
       end
     end
   end
+
+  def remove_non_mapped_index(object)
+    if !object[:index].is_a?(Array)
+      object.delete(:index)
+    end
+  end
 end
diff --git a/lib/custom_wizard/wizard.rb b/lib/custom_wizard/wizard.rb
index 3e12c31d..82693eed 100644
--- a/lib/custom_wizard/wizard.rb
+++ b/lib/custom_wizard/wizard.rb
@@ -26,9 +26,10 @@ class CustomWizard::Wizard
                 :needs_groups,
                 :steps,
                 :step_ids,
+                :first_step,
+                :start,
                 :actions,
-                :user,
-                :first_step
+                :user
 
   def initialize(attrs = {}, user = nil)
     @user = user
@@ -68,8 +69,8 @@ class CustomWizard::Wizard
     val.nil? ? false : ActiveRecord::Type::Boolean.new.cast(val)
   end
 
-  def create_step(step_name)
-    ::Wizard::Step.new(step_name)
+  def create_step(step_id)
+    ::CustomWizard::Step.new(step_id)
   end
 
   def append_step(step)
@@ -77,37 +78,58 @@ class CustomWizard::Wizard
 
     yield step if block_given?
 
-    last_step = steps.last
     steps << step
+    step.wizard = self
+    step.index = (steps.size == 1 ? 0 : steps.size) if step.index.nil?
+  end
 
-    if steps.size == 1
-      @first_step = step
-      step.index = 0
-    elsif last_step.present?
-      last_step.next = step
-      step.previous = last_step
-      step.index = last_step.index + 1
+  def update_step_order!
+    steps.sort_by!(&:index)
+
+    steps.each_with_index do |step, index|
+      if index === 0
+        @first_step = step
+        @start = step.id
+      else
+        last_step = steps[index - 1]
+        last_step.next = step
+        step.previous = last_step
+      end
+
+      step.index = index
+
+      if index === (steps.length - 1)
+        step.conditional_final_step = true
+      end
+
+      if index === (step_ids.length - 1)
+        step.last_step = true
+      end
+
+      if step.previous && step.previous.id === last_completed_step_id
+        @start = step.id
+      end
     end
   end
 
-  def start
-    return nil if !user
-
-    if unfinished? && last_completed_step = ::UserHistory.where(
+  def last_completed_step_id
+    if user && unfinished? && last_completed_step = ::UserHistory.where(
         acting_user_id: user.id,
         action: ::UserHistory.actions[:custom_wizard_step],
         context: id,
-        subject: steps.map(&:id)
+        subject: step_ids
       ).order("created_at").last
 
-      step_id = last_completed_step.subject
-      last_index = steps.index { |s| s.id == step_id }
-      steps[last_index + 1]
+      last_completed_step.subject
     else
-      @first_step
+      nil
     end
   end
 
+  def find_step(step_id)
+    steps.select { |step| step.id === step_id }.first
+  end
+
   def create_updater(step_id, submission)
     step = @steps.find { |s| s.id == step_id }
     wizard = self
@@ -200,12 +222,13 @@ class CustomWizard::Wizard
   end
 
   def submissions
-    Array.wrap(PluginStore.get("#{id}_submissions", user.id))
+    return nil unless user.present?
+    @submissions ||= Array.wrap(PluginStore.get("#{id}_submissions", user.id))
   end
 
   def current_submission
-    if submissions.present? && !submissions.last.key?("submitted_at")
-      submissions.last
+    if submissions.present? && submissions.last.present? && !submissions.last.key?("submitted_at")
+      submissions.last.with_indifferent_access
     else
       nil
     end
@@ -213,6 +236,27 @@ class CustomWizard::Wizard
 
   def set_submissions(submissions)
     PluginStore.set("#{id}_submissions", user.id, Array.wrap(submissions))
+    @submissions = nil
+  end
+
+  def save_submission(submission)
+    return nil unless save_submissions
+
+    submissions.pop(1) if unfinished?
+    submissions.push(submission)
+    set_submissions(submissions)
+  end
+
+  def final_cleanup!
+    if id == user.custom_fields['redirect_to_wizard']
+      user.custom_fields.delete('redirect_to_wizard')
+      user.save_custom_fields(true)
+    end
+
+    if submission = current_submission
+      submission['submitted_at'] = Time.now.iso8601
+      save_submission(submission)
+    end
   end
 
   def self.submissions(wizard_id, user)
@@ -276,7 +320,7 @@ class CustomWizard::Wizard
   end
 
   def self.set_submission_redirect(user, wizard_id, url)
-    PluginStore.set("#{wizard_id.underscore}_submissions", user.id, [{ redirect_to: url }])
+    set_submissions(wizard_id, user, [{ redirect_to: url }])
   end
 
   def self.set_wizard_redirect(wizard_id, user)
diff --git a/plugin.rb b/plugin.rb
index 56673a13..e3d32129 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -66,6 +66,7 @@ after_initialize do
     ../lib/custom_wizard/mapper.rb
     ../lib/custom_wizard/log.rb
     ../lib/custom_wizard/step_updater.rb
+    ../lib/custom_wizard/step.rb
     ../lib/custom_wizard/template.rb
     ../lib/custom_wizard/wizard.rb
     ../lib/custom_wizard/api/api.rb
@@ -89,8 +90,6 @@ after_initialize do
     ../extensions/extra_locales_controller.rb
     ../extensions/invites_controller.rb
     ../extensions/users_controller.rb
-    ../extensions/wizard_field.rb
-    ../extensions/wizard_step.rb
     ../extensions/custom_field/preloader.rb
     ../extensions/custom_field/serializer.rb
   ].each do |path|
@@ -172,8 +171,6 @@ after_initialize do
   ::ExtraLocalesController.prepend ExtraLocalesControllerCustomWizard
   ::InvitesController.prepend InvitesControllerCustomWizard
   ::UsersController.prepend CustomWizardUsersController
-  ::Wizard::Field.prepend CustomWizardFieldExtension
-  ::Wizard::Step.prepend CustomWizardStepExtension
 
   full_path = "#{Rails.root}/plugins/discourse-custom-wizard/assets/stylesheets/wizard/wizard_custom.scss"
   if Stylesheet::Importer.respond_to?(:plugin_assets)
diff --git a/serializers/custom_wizard/wizard_field_serializer.rb b/serializers/custom_wizard/wizard_field_serializer.rb
index f9c42e6c..19025dff 100644
--- a/serializers/custom_wizard/wizard_field_serializer.rb
+++ b/serializers/custom_wizard/wizard_field_serializer.rb
@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
-class CustomWizard::FieldSerializer < ::WizardFieldSerializer
+class CustomWizard::FieldSerializer < ::ApplicationSerializer
 
-  attributes :image,
+  attributes :id,
+             :index,
+             :type,
+             :required,
+             :value,
+             :label,
+             :placeholder,
+             :description,
+             :image,
              :file_types,
              :format,
              :limit,
@@ -10,19 +18,54 @@ class CustomWizard::FieldSerializer < ::WizardFieldSerializer
              :content,
              :validations,
              :max_length,
-             :char_counter,
-             :number
+             :char_counter
+
+  def id
+    object.id
+  end
+
+  def index
+    object.index
+  end
+
+  def type
+    object.type
+  end
+
+  def required
+    object.required
+  end
+
+  def value
+    object.value
+  end
+
+  def include_value?
+    object.value.present?
+  end
+
+  def i18n_key
+    @i18n_key ||= "wizard.step.#{object.step.id}.fields.#{object.id}".underscore
+  end
 
   def label
     return object.label if object.label.present?
     I18n.t("#{object.key || i18n_key}.label", default: '')
   end
 
+  def include_label?
+    label.present?
+  end
+
   def description
     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 image
     object.image
   end
@@ -35,6 +78,10 @@ class CustomWizard::FieldSerializer < ::WizardFieldSerializer
     I18n.t("#{object.key || i18n_key}.placeholder", default: '')
   end
 
+  def include_placeholder?
+    placeholder.present?
+  end
+
   def file_types
     object.file_types
   end
@@ -55,10 +102,6 @@ class CustomWizard::FieldSerializer < ::WizardFieldSerializer
     object.content
   end
 
-  def include_choices?
-    object.choices.present?
-  end
-
   def validations
     validations = {}
     object.validations&.each do |type, props|
@@ -77,8 +120,4 @@ class CustomWizard::FieldSerializer < ::WizardFieldSerializer
   def char_counter
     object.char_counter
   end
-
-  def number
-    object.number
-  end
 end
diff --git a/serializers/custom_wizard/wizard_serializer.rb b/serializers/custom_wizard/wizard_serializer.rb
index 9ab7291f..f858c195 100644
--- a/serializers/custom_wizard/wizard_serializer.rb
+++ b/serializers/custom_wizard/wizard_serializer.rb
@@ -30,7 +30,7 @@ class CustomWizard::WizardSerializer < CustomWizard::BasicWizardSerializer
   end
 
   def start
-    object.start.id
+    object.start
   end
 
   def include_start?
diff --git a/serializers/custom_wizard/wizard_step_serializer.rb b/serializers/custom_wizard/wizard_step_serializer.rb
index b5648e46..85f527bb 100644
--- a/serializers/custom_wizard/wizard_step_serializer.rb
+++ b/serializers/custom_wizard/wizard_step_serializer.rb
@@ -1,20 +1,74 @@
 # frozen_string_literal: true
 
-class CustomWizard::StepSerializer < ::WizardStepSerializer
+class CustomWizard::StepSerializer < ::ApplicationSerializer
+
+  attributes :id,
+             :index,
+             :next,
+             :previous,
+             :description,
+             :title,
+             :banner,
+             :permitted,
+             :permitted_message,
+             :final
 
-  attributes :permitted, :permitted_message
   has_many :fields, serializer: ::CustomWizard::FieldSerializer, embed: :objects
 
+  def id
+    object.id
+  end
+
+  def index
+    object.index
+  end
+
+  def next
+    object.next.id if object.next.present?
+  end
+
+  def include_next?
+    object.next.present?
+  end
+
+  def previous
+    object.previous.id if object.previous.present?
+  end
+
+  def include_previous?
+    object.previous.present?
+  end
+
+  def i18n_key
+    @i18n_key ||= "wizard.step.#{object.id}".underscore
+  end
+
   def title
     return PrettyText.cook(object.title) if object.title
     PrettyText.cook(I18n.t("#{object.key || i18n_key}.title", default: ''))
   end
 
+  def include_title?
+    title.present?
+  end
+
   def description
     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?
+    description.present?
+  end
+
+  def banner
+    object.banner
+  end
+
+  def include_banner?
+    object.banner.present?
+  end
+
   def permitted
     object.permitted
   end
@@ -22,4 +76,8 @@ class CustomWizard::StepSerializer < ::WizardStepSerializer
   def permitted_message
     object.permitted_message
   end
+
+  def final
+    object.final?
+  end
 end
diff --git a/spec/components/custom_wizard/action_spec.rb b/spec/components/custom_wizard/action_spec.rb
index 44cb6144..28f2cab8 100644
--- a/spec/components/custom_wizard/action_spec.rb
+++ b/spec/components/custom_wizard/action_spec.rb
@@ -6,19 +6,25 @@ describe CustomWizard::Action do
   fab!(:category) { Fabricate(:category, name: 'cat1', slug: 'cat-slug') }
   fab!(:group) { Fabricate(:group) }
 
+  let(:wizard_template) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
+      ).read
+    )
+  }
+
   let(:open_composer) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/actions/open_composer.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/actions/open_composer.json"
+      ).read
+    )
   }
 
   before do
     Group.refresh_automatic_group!(:trust_level_2)
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end
 
@@ -156,7 +162,6 @@ describe CustomWizard::Action do
       action = CustomWizard::Action.new(
         wizard: wizard,
         action: open_composer,
-        user: user,
         data: {}
       )
       action.perform
@@ -179,8 +184,7 @@ describe CustomWizard::Action do
 
   it 'creates a group' do
     wizard = CustomWizard::Builder.new(@template[:id], user).build
-    step_id = wizard.steps[0].id
-    updater = wizard.create_updater(step_id, step_1_field_1: "Text input").update
+    wizard.create_updater(wizard.steps[0].id, step_1_field_1: "Text input").update
     expect(Group.where(name: wizard.current_submission['action_9']).exists?).to eq(true)
   end
 
@@ -210,6 +214,6 @@ describe CustomWizard::Action do
     wizard = CustomWizard::Builder.new(@template[:id], user).build
     updater = wizard.create_updater(wizard.steps.last.id, {})
     updater.update
-    expect(updater.result[:redirect_on_complete]).to eq("https://google.com")
+    expect(updater.result[:redirect_on_next]).to eq("https://google.com")
   end
 end
diff --git a/spec/components/custom_wizard/builder_spec.rb b/spec/components/custom_wizard/builder_spec.rb
index 54a6ceff..d9d3524e 100644
--- a/spec/components/custom_wizard/builder_spec.rb
+++ b/spec/components/custom_wizard/builder_spec.rb
@@ -16,21 +16,35 @@ describe CustomWizard::Builder do
   fab!(:group) { Fabricate(:group) }
 
   let(:required_data_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
+      ).read
+    )
   }
 
   let(:permitted_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
+      ).read
+    )
   }
 
   let(:permitted_param_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/permitted_params.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/permitted_params.json"
+      ).read
+    )
+  }
+
+  let(:user_condition_json) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/user_condition.json"
+      ).read
+    )
   }
 
   before do
@@ -263,6 +277,23 @@ describe CustomWizard::Builder do
           expect(wizard.current_submission['saved_param']).to eq('param_value')
         end
       end
+
+      context "with condition" do
+        before do
+          @template[:steps][0][:condition] = user_condition_json['condition']
+          CustomWizard::Template.save(@template.as_json)
+        end
+
+        it "adds step when condition is passed" do
+          wizard = CustomWizard::Builder.new(@template[:id], trusted_user).build
+          expect(wizard.steps.first.id).to eq(@template[:steps][0]['id'])
+        end
+
+        it "does not add step when condition is not passed" do
+          wizard = CustomWizard::Builder.new(@template[:id], user).build
+          expect(wizard.steps.first.id).to eq(@template[:steps][1]['id'])
+        end
+      end
     end
 
     context 'building field' do
@@ -284,6 +315,23 @@ describe CustomWizard::Builder do
             .fields.length
         ).to eq(4)
       end
+
+      context "with condition" do
+        before do
+          @template[:steps][0][:fields][0][:condition] = user_condition_json['condition']
+          CustomWizard::Template.save(@template.as_json)
+        end
+
+        it "adds field when condition is passed" do
+          wizard = CustomWizard::Builder.new(@template[:id], trusted_user).build
+          expect(wizard.steps.first.fields.first.id).to eq(@template[:steps][0][:fields][0]['id'])
+        end
+
+        it "does not add field when condition is not passed" do
+          wizard = CustomWizard::Builder.new(@template[:id], user).build
+          expect(wizard.steps.first.fields.first.id).to eq(@template[:steps][0][:fields][1]['id'])
+        end
+      end
     end
 
     context 'on update' do
diff --git a/spec/components/custom_wizard/field_spec.rb b/spec/components/custom_wizard/field_spec.rb
index f6c2d68b..871c42cd 100644
--- a/spec/components/custom_wizard/field_spec.rb
+++ b/spec/components/custom_wizard/field_spec.rb
@@ -2,6 +2,12 @@
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Field do
+  let(:field_hash) do
+    JSON.parse(File.open(
+      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/field.json"
+    ).read).with_indifferent_access
+  end
+
   before do
     CustomWizard::Field.register(
       'location',
@@ -13,6 +19,19 @@ describe CustomWizard::Field do
     )
   end
 
+  it "initialize custom field attributes" do
+    field = CustomWizard::Field.new(field_hash)
+    expect(field.id).to eq("field_id")
+    expect(field.index).to eq(0)
+    expect(field.label).to eq("<p>Field Label</p>")
+    expect(field.image).to eq("field_image_url.png")
+    expect(field.description).to eq("Field description")
+    expect(field.required).to eq(true)
+    expect(field.key).to eq("field.locale.key")
+    expect(field.type).to eq("field_type")
+    expect(field.content).to eq([])
+  end
+
   it "registers custom field types" do
     expect(CustomWizard::Field.types[:location].present?).to eq(true)
   end
diff --git a/spec/components/custom_wizard/step_spec.rb b/spec/components/custom_wizard/step_spec.rb
new file mode 100644
index 00000000..bf4613a4
--- /dev/null
+++ b/spec/components/custom_wizard/step_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require_relative '../../plugin_helper'
+
+describe CustomWizard::Step do
+  let(:step_hash) do
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/step.json"
+      ).read
+    ).with_indifferent_access
+  end
+
+  let(:field_hash) do
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/field.json"
+      ).read
+    ).with_indifferent_access
+  end
+
+  before do
+    @step = CustomWizard::Step.new(step_hash[:id])
+  end
+
+  it "adds fields" do
+    @step.add_field(field_hash)
+    expect(@step.fields.size).to eq(1)
+    expect(@step.fields.first.index).to eq(0)
+  end
+
+  it "adds fields with custom indexes" do
+    field_hash[:index] = 2
+    @step.add_field(field_hash)
+    expect(@step.fields.first.index).to eq(2)
+  end
+end
diff --git a/spec/components/custom_wizard/wizard_spec.rb b/spec/components/custom_wizard/wizard_spec.rb
index 57d15241..aed44fe6 100644
--- a/spec/components/custom_wizard/wizard_spec.rb
+++ b/spec/components/custom_wizard/wizard_spec.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Wizard do
@@ -7,27 +8,33 @@ describe CustomWizard::Wizard do
   fab!(:admin_user) { Fabricate(:user, admin: true) }
 
   let(:template_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
+      ).read
+    )
   }
 
   let(:permitted_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
-    ).read)
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
+      ).read
+    )
   }
 
   before do
     Group.refresh_automatic_group!(:trust_level_3)
-
     @permitted_template = template_json.dup
     @permitted_template["permitted"] = permitted_json["permitted"]
-
     @wizard = CustomWizard::Wizard.new(template_json, user)
+  end
+
+  def append_steps
     template_json['steps'].each do |step_template|
       @wizard.append_step(step_template['id'])
     end
+    @wizard.update_step_order!
   end
 
   def progress_step(step_id, acting_user: user, wizard: @wizard)
@@ -37,16 +44,48 @@ describe CustomWizard::Wizard do
       context: wizard.id,
       subject: step_id
     )
+    @wizard.update_step_order!
   end
 
-  it "appends steps from a template" do
+  it "appends steps" do
+    append_steps
     expect(@wizard.steps.length).to eq(3)
   end
 
+  it "appends steps with indexes" do
+    append_steps
+    expect(@wizard.steps.first.index).to eq(0)
+    expect(@wizard.steps.last.index).to eq(2)
+  end
+
+  it "appends steps with custom indexes" do
+    template_json['steps'][0]['index'] = 2
+    template_json['steps'][1]['index'] = 1
+    template_json['steps'][2]['index'] = 0
+
+    template_json['steps'].each do |step_template|
+      @wizard.append_step(step_template['id']) do |step|
+        step.index = step_template['index'] if step_template['index']
+      end
+    end
+
+    expect(@wizard.steps.first.index).to eq(2)
+    expect(@wizard.steps.last.index).to eq(0)
+
+    @wizard.update_step_order!
+
+    expect(@wizard.steps.first.id).to eq("step_3")
+    expect(@wizard.steps.last.id).to eq("step_1")
+
+    expect(@wizard.steps.first.next.id).to eq("step_2")
+    expect(@wizard.steps.last.next).to eq(nil)
+  end
+
   it "determines the user's current step" do
-    expect(@wizard.start.id).to eq('step_1')
+    append_steps
+    expect(@wizard.start).to eq('step_1')
     progress_step('step_1')
-    expect(@wizard.start.id).to eq('step_2')
+    expect(@wizard.start).to eq('step_2')
   end
 
   it "creates a step updater" do
@@ -57,6 +96,7 @@ describe CustomWizard::Wizard do
   end
 
   it "determines whether a wizard is unfinished" do
+    append_steps
     expect(@wizard.unfinished?).to eq(true)
     progress_step("step_1")
     expect(@wizard.unfinished?).to eq(true)
@@ -67,6 +107,7 @@ describe CustomWizard::Wizard do
   end
 
   it "determines whether a wizard has been completed by a user" do
+    append_steps
     expect(@wizard.completed?).to eq(false)
     progress_step("step_1")
     progress_step("step_2")
@@ -75,6 +116,8 @@ describe CustomWizard::Wizard do
   end
 
   it "is not completed if steps submitted before after time" do
+    append_steps
+
     progress_step("step_1")
     progress_step("step_2")
     progress_step("step_3")
@@ -83,7 +126,6 @@ describe CustomWizard::Wizard do
     template_json['after_time_scheduled'] = Time.now + 3.hours
 
     wizard = CustomWizard::Wizard.new(template_json, user)
-
     expect(wizard.completed?).to eq(false)
   end
 
@@ -125,6 +167,8 @@ describe CustomWizard::Wizard do
   end
 
   it "lets a permitted user access a complete wizard with multiple submissions" do
+    append_steps
+
     progress_step("step_1", acting_user: trusted_user)
     progress_step("step_2", acting_user: trusted_user)
     progress_step("step_3", acting_user: trusted_user)
@@ -135,6 +179,8 @@ describe CustomWizard::Wizard do
   end
 
   it "does not let an unpermitted user access a complete wizard without multiple submissions" do
+    append_steps
+
     progress_step("step_1", acting_user: trusted_user)
     progress_step("step_2", acting_user: trusted_user)
     progress_step("step_3", acting_user: trusted_user)
diff --git a/spec/extensions/wizard_field_spec.rb b/spec/extensions/wizard_field_spec.rb
deleted file mode 100644
index 370c25e7..00000000
--- a/spec/extensions/wizard_field_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-require_relative '../plugin_helper'
-
-describe CustomWizardFieldExtension do
-  let(:field_hash) do
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/field/field.json"
-    ).read).with_indifferent_access
-  end
-
-  it "adds custom field attributes" do
-    field = Wizard::Field.new(field_hash)
-    expect(field.id).to eq("field_id")
-    expect(field.label).to eq("<p>Field Label</p>")
-    expect(field.image).to eq("field_image_url.png")
-    expect(field.description).to eq("Field description")
-    expect(field.required).to eq(true)
-    expect(field.key).to eq("field.locale.key")
-    expect(field.type).to eq("field_type")
-    expect(field.content).to eq([])
-  end
-end
diff --git a/spec/extensions/wizard_step_spec.rb b/spec/extensions/wizard_step_spec.rb
deleted file mode 100644
index 1a9cc0e5..00000000
--- a/spec/extensions/wizard_step_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-require_relative '../plugin_helper'
-
-describe CustomWizardStepExtension do
-  let(:step_hash) do
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/step.json"
-    ).read).with_indifferent_access
-  end
-
-  it "adds custom step attributes" do
-    step = Wizard::Step.new(step_hash[:id])
-    [
-      :title,
-      :description,
-      :key,
-      :permitted,
-      :permitted_message
-    ].each do |attr|
-      step.send("#{attr.to_s}=", step_hash[attr])
-      expect(step.send(attr)).to eq(step_hash[attr])
-    end
-  end
-end
diff --git a/spec/fixtures/condition/user_condition.json b/spec/fixtures/condition/user_condition.json
new file mode 100644
index 00000000..c6347b04
--- /dev/null
+++ b/spec/fixtures/condition/user_condition.json
@@ -0,0 +1,17 @@
+{
+  "condition": [
+    {
+      "type": "validation",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "username",
+          "key_type": "user_field",
+          "value": "angus",
+          "value_type": "text",
+          "connector": "equal"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/condition/wizard_field_condition.json b/spec/fixtures/condition/wizard_field_condition.json
new file mode 100644
index 00000000..12d47b38
--- /dev/null
+++ b/spec/fixtures/condition/wizard_field_condition.json
@@ -0,0 +1,17 @@
+{
+  "condition": [
+    {
+      "type": "validation",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "step_1_field_1",
+          "key_type": "wizard_field",
+          "value": "Condition will pass",
+          "value_type": "text",
+          "connector": "equal"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/spec/fixtures/field/field.json b/spec/fixtures/field/field.json
index c2de266d..c46a53cd 100644
--- a/spec/fixtures/field/field.json
+++ b/spec/fixtures/field/field.json
@@ -1,5 +1,6 @@
 {
   "id": "field_id",
+  "index": 0,
   "label": "Field Label",
   "image": "field_image_url.png",
   "description": "Field description",
diff --git a/spec/fixtures/step/step.json b/spec/fixtures/step/step.json
index 5c6c5f58..97cd3318 100644
--- a/spec/fixtures/step/step.json
+++ b/spec/fixtures/step/step.json
@@ -1,5 +1,6 @@
 {
   "id": "step_1",
+  "index": 0,
   "title": "Text",
   "description": "Step description",
   "image": "step_image_url.png",
diff --git a/spec/fixtures/wizard.json b/spec/fixtures/wizard.json
index ccaea390..20ff1441 100644
--- a/spec/fixtures/wizard.json
+++ b/spec/fixtures/wizard.json
@@ -535,7 +535,7 @@
     },
     {
       "id": "action_10",
-      "run_after": "wizard_completion",
+      "run_after": "step_3",
       "type": "route_to",
       "url": [
         {
diff --git a/spec/requests/custom_wizard/steps_controller_spec.rb b/spec/requests/custom_wizard/steps_controller_spec.rb
index dd3b52a1..c58f13a2 100644
--- a/spec/requests/custom_wizard/steps_controller_spec.rb
+++ b/spec/requests/custom_wizard/steps_controller_spec.rb
@@ -11,12 +11,49 @@ describe CustomWizard::StepsController do
     )
   }
 
-  before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
+  fab!(:user2) {
+    Fabricate(
+      :user,
+      username: 'bob',
+      email: "bob@email.com",
+      trust_level: TrustLevel[2]
+    )
+  }
+
+  let(:wizard_template) {
+    JSON.parse(
+      File.open(
         "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
+      ).read
+    )
+  }
+
+  let(:wizard_field_condition_template) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/wizard_field_condition.json"
+      ).read
+    )
+  }
+
+  let(:user_condition_template) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/user_condition.json"
+      ).read
+    )
+  }
+
+  let(:permitted_json) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard/permitted.json"
+      ).read
+    )
+  }
+
+  before do
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
     sign_in(user)
   end
 
@@ -27,17 +64,189 @@ describe CustomWizard::StepsController do
       }
     }
     expect(response.status).to eq(200)
+    expect(response.parsed_body['wizard']['start']).to eq("step_2")
 
-    wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
-    expect(wizard.current_submission['step_1_field_1']).to eq("Text input")
-    expect(wizard.start.id).to eq("step_2")
+    wizard_id = response.parsed_body['wizard']['id']
+    wizard = CustomWizard::Wizard.create(wizard_id, user)
+    expect(wizard.submissions.last['step_1_field_1']).to eq("Text input")
+  end
+
+  context "raises an error" do
+    it "when the wizard doesnt exist" do
+      put '/w/not-super-mega-fun-wizard/steps/step_1.json'
+      expect(response.status).to eq(400)
+    end
+
+    it "when the user cant access the wizard" do
+      new_template = wizard_template.dup
+      new_template["permitted"] = permitted_json["permitted"]
+      CustomWizard::Template.save(new_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json'
+      expect(response.status).to eq(403)
+    end
+
+    it "when the step doesnt exist" do
+      put '/w/super-mega-fun-wizard/steps/step_10.json'
+      expect(response.status).to eq(400)
+    end
+
+    it "when user cant see the step due to conditions" do
+      sign_in(user2)
+
+      new_wizard_template = wizard_template.dup
+      new_wizard_template['steps'][0]['condition'] = user_condition_template['condition']
+      CustomWizard::Template.save(new_wizard_template, skip_jobs: true)
+
+      put '/w/super-mega-fun-wizard/steps/step_1.json'
+      expect(response.status).to eq(403)
+    end
   end
 
   it "works if the step has no fields" do
     put '/w/super-mega-fun-wizard/steps/step_1.json'
     expect(response.status).to eq(200)
+    expect(response.parsed_body['wizard']['start']).to eq("step_2")
+  end
 
-    wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
-    expect(wizard.start.id).to eq("step_2")
+  it "returns an updated wizard when condition passes" do
+    new_template = wizard_template.dup
+    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition will pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['wizard']['start']).to eq("step_2")
+  end
+
+  it "returns an updated wizard when condition doesnt pass" do
+    new_template = wizard_template.dup
+    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition wont pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['wizard']['start']).to eq("step_3")
+  end
+
+  it "runs completion actions if user has completed wizard" do
+    new_template = wizard_template.dup
+
+    ## route_to action
+    new_template['actions'].last['run_after'] = 'wizard_completion'
+    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition wont pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['redirect_on_complete']).to eq("https://google.com")
+  end
+
+  it "saves results of completion actions if user has completed wizard" do
+    new_template = wizard_template.dup
+
+    ## Create group action
+    new_template['actions'].first['run_after'] = 'wizard_completion'
+    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "My cool group"
+      }
+    }
+    expect(response.status).to eq(200)
+
+    put '/w/super-mega-fun-wizard/steps/step_3.json'
+    expect(response.status).to eq(200)
+
+    wizard_id = response.parsed_body['wizard']['id']
+    wizard = CustomWizard::Wizard.create(wizard_id, user)
+    group_name = wizard.submissions.last['action_9']
+    group = Group.find_by(name: group_name)
+    expect(group.full_name).to eq("My cool group")
+  end
+
+  it "returns a final step without conditions" do
+    put '/w/super-mega-fun-wizard/steps/step_1.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(false)
+
+    put '/w/super-mega-fun-wizard/steps/step_2.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(false)
+
+    put '/w/super-mega-fun-wizard/steps/step_3.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(true)
+  end
+
+  it "returns the correct final step when the conditional final step and last step are the same" do
+    new_template = wizard_template.dup
+    new_template['steps'][0]['condition'] = user_condition_template['condition']
+    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition will pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(false)
+
+    put '/w/super-mega-fun-wizard/steps/step_2.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(false)
+
+    put '/w/super-mega-fun-wizard/steps/step_3.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(true)
+  end
+
+  it "returns the correct final step when the conditional final step and last step are different" do
+    new_template = wizard_template.dup
+    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition will not pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(false)
+
+    put '/w/super-mega-fun-wizard/steps/step_2.json'
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(true)
+  end
+
+  it "returns the correct final step when the conditional final step is determined in the same action" do
+    new_template = wizard_template.dup
+    new_template['steps'][1]['condition'] = wizard_field_condition_template['condition']
+    new_template['steps'][2]['condition'] = wizard_field_condition_template['condition']
+    CustomWizard::Template.save(new_template, skip_jobs: true)
+
+    put '/w/super-mega-fun-wizard/steps/step_1.json', params: {
+      fields: {
+        step_1_field_1: "Condition will not pass"
+      }
+    }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body['final']).to eq(true)
   end
 end
diff --git a/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb b/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
index 944947e6..1fa9671c 100644
--- a/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
+++ b/spec/serializers/custom_wizard/wizard_field_serializer_spec.rb
@@ -20,9 +20,11 @@ describe CustomWizard::FieldSerializer do
       each_serializer: CustomWizard::FieldSerializer,
       scope: Guardian.new(user)
     ).as_json
-    expect(json_array.length).to eq(4)
+
+    expect(json_array.size).to eq(4)
     expect(json_array[0][:label]).to eq("<p>Text</p>")
     expect(json_array[0][:description]).to eq("Text field description.")
+    expect(json_array[3][:index]).to eq(3)
   end
 
   it "should return optional field attributes" do
@@ -32,7 +34,6 @@ describe CustomWizard::FieldSerializer do
       scope: Guardian.new(user)
     ).as_json
     expect(json_array[0][:format]).to eq("YYYY-MM-DD")
-    expect(json_array[3][:number]).to eq(4)
     expect(json_array[6][:file_types]).to eq(".jpg,.jpeg,.png")
   end
 end
diff --git a/spec/serializers/custom_wizard/wizard_step_serializer.rb b/spec/serializers/custom_wizard/wizard_step_serializer.rb
deleted file mode 100644
index c2d82962..00000000
--- a/spec/serializers/custom_wizard/wizard_step_serializer.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../plugin_helper'
-
-describe CustomWizard::StepSerializer do
-  fab!(:user) { Fabricate(:user) }
-
-  let(:required_data_json) {
-    JSON.parse(File.open(
-      "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
-    ).read)
-  }
-
-  before do
-    CustomWizard::Template.save(
-      JSON.parse(File.open(
-        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
-      ).read),
-    skip_jobs: true)
-    @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
-  end
-
-  it 'should return basic step attributes' do
-    json_array = ActiveModel::ArraySerializer.new(
-      @wizard.steps,
-      each_serializer: CustomWizard::StepSerializer,
-      scope: Guardian.new(user)
-    ).as_json
-    expect(json_array[0][:wizard_step][:title]).to eq("Text")
-    expect(json_array[0][:wizard_step][:description]).to eq("Text inputs!")
-  end
-
-  it 'should return fields' do
-    json_array = ActiveModel::ArraySerializer.new(
-      @wizard.steps,
-      each_serializer: CustomWizard::StepSerializer,
-      scope: Guardian.new(user)
-    ).as_json
-    expect(json_array[0][:wizard_step][:fields].length).to eq(4)
-  end
-
-  context 'with required data' do
-    before do
-      @template[:steps][0][:required_data] = required_data_json['required_data']
-      @template[:steps][0][:required_data_message] = required_data_json['required_data_message']
-      CustomWizard::Template.save(@template.as_json)
-    end
-
-    it 'should return permitted attributes' do
-      json_array = ActiveModel::ArraySerializer.new(
-        @wizard.steps,
-        each_serializer: CustomWizard::StepSerializer,
-        scope: Guardian.new(user)
-      ).as_json
-      expect(json_array[0][:wizard_step][:permitted]).to eq(false)
-      expect(json_array[0][:wizard_step][:permitted_message]).to eq("Missing required data")
-    end
-  end
-end
diff --git a/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb b/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb
new file mode 100644
index 00000000..35ce0fd2
--- /dev/null
+++ b/spec/serializers/custom_wizard/wizard_step_serializer_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require_relative '../../plugin_helper'
+
+describe CustomWizard::StepSerializer do
+  fab!(:user) { Fabricate(:user) }
+
+  let(:wizard_template) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"
+      ).read
+    )
+  }
+
+  let(:required_data_json) {
+    JSON.parse(
+      File.open(
+        "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/step/required_data.json"
+      ).read
+    )
+  }
+
+  before do
+    CustomWizard::Template.save(wizard_template, skip_jobs: true)
+    @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
+  end
+
+  it 'should return basic step attributes' do
+    json_array = ActiveModel::ArraySerializer.new(
+      @wizard.steps,
+      each_serializer: described_class,
+      scope: Guardian.new(user)
+    ).as_json
+    expect(json_array[0][:title]).to eq("<p>Text</p>")
+    expect(json_array[0][:description]).to eq("<p>Text inputs!</p>")
+    expect(json_array[1][:index]).to eq(1)
+  end
+
+  it 'should return fields' do
+    json_array = ActiveModel::ArraySerializer.new(
+      @wizard.steps,
+      each_serializer: described_class,
+      scope: Guardian.new(user)
+    ).as_json
+    expect(json_array[0][:fields].length).to eq(4)
+  end
+
+  context 'with required data' do
+    before do
+      wizard_template['steps'][0]['required_data'] = required_data_json['required_data']
+      wizard_template['steps'][0]['required_data_message'] = required_data_json['required_data_message']
+      CustomWizard::Template.save(wizard_template)
+      @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
+    end
+
+    it 'should return permitted attributes' do
+      json_array = ActiveModel::ArraySerializer.new(
+        @wizard.steps,
+        each_serializer: described_class,
+        scope: Guardian.new(user)
+      ).as_json
+      expect(json_array[0][:permitted]).to eq(false)
+      expect(json_array[0][:permitted_message]).to eq("Missing required data")
+    end
+  end
+end