Merge pull request #96 from paviliondev/hbs-lint

fixed linting for all the hbs files
2024-11-24 02:10:29 +01:00 · 2021-04-16 16:01:23 +10:00 · 2021-04-16 16:01:23 +10:00 · d7542d58c7
Commit d7542d58c7
--- 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}}
--- 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}}
--- 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
          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,26 +278,29 @@
 </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">
+      <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="{{unbound logentry.userpath}}" data-user-card="{{unbound logentry.username}}">{{avatar logentry imageSize="large"}}</a>
+                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="large"}}</a>
              </div>
            </td>
            <td>{{logentry.status}}</td>
@ -305,6 +308,7 @@
            <td>{{logentry.error}}</td>
          </tr>
        {{/each}}
+      </tbody>
    </table>
  </div>
 </div>
--- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs
@ -2,9 +2,9 @@
  {{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
--- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs
@ -1,5 +1,5 @@
 <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
@ -14,23 +14,27 @@
  opts=messageOpts
  type=messageType
  url=documentationUrl
-  component='custom_fields'}}
+  component="custom_fields"}}

 <div class="admin-wizard-container">
  {{#if customFields}}
    <table>
+      <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')}}
+            removeField=(action "removeField")
+            saveField=(action "saveField")}}
        {{/each}}
+      </tbody>
    </table>
  {{/if}}
 </div>
--- a/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-logs.hbs
@ -1,5 +1,5 @@
 <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"
@ -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>
--- 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>
@ -68,13 +68,13 @@
            {{input
              type="checkbox"
              class="export"
-              change=(action 'selectWizard')}}
+              change=(action "selectWizard")}}
          </td>
          <td class="control-column">
            {{input
              type="checkbox"
              class="destroy"
-              change=(action 'selectWizard')}}
+              change=(action "selectWizard")}}
          </td>
        </tr>
      {{/each}}
--- a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
@ -1,9 +1,9 @@
 {{#if submissions}}
  <div class="wizard-header large">
-    <label>{{i18n 'admin.wizard.submissions.title' name=wizard.name}}</label>
+    <label>{{i18n "admin.wizard.submissions.title" name=wizard.name}}</label>

-    <a class="btn btn-default download-link" href="{{downloadUrl}}" target="_blank">
-       {{d-icon 'download'}}
+    <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>
@ -12,11 +12,14 @@

  <div class="wizard-submissions">
    <table>
+      <thead>
        <tr>
          {{#each fields as |f|}}
            <th>{{f}}</th>
          {{/each}}
        </tr>
+      </thead>
+      <tbody>
        {{#each submissions as |s|}}
          <tr>
            {{#each-in s as |k v|}}
@ -24,6 +27,7 @@
            {{/each-in}}
          </tr>
        {{/each}}
+      </tbody>
    </table>
  </div>
 {{/if}}
--- 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>

--- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
@ -12,7 +12,7 @@
        {{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>
@ -20,7 +20,7 @@
  <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
@ -33,95 +33,95 @@

    <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>
+        {{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>
+        <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.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>
+        <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>
+        {{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>
@ -133,21 +133,21 @@

        <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>

@ -185,18 +185,18 @@
      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>
--- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
+++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs
@ -2,9 +2,9 @@
  {{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
@ -16,7 +16,7 @@
 {{wizard-message
  key=messageKey
  url=messageUrl
-  component='wizard'}}
+  component="wizard"}}

 <div class="admin-wizard-container settings">
  {{outlet}}
--- 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">
--- 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}}
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@ -38,7 +38,7 @@
 {{wizard-message
  key=messageKey
  url=messageUrl
-  component='action'}}
+  component="action"}}

 {{#if basicTopicFields}}
  <div class="setting full field-mapper-setting">
@ -49,12 +49,12 @@
    <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>
@ -68,16 +68,16 @@
      {{combo-box
        value=action.post
        content=wizardFields
-        nameProperty='label'
+        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,7 +85,7 @@
  {{#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">
@ -106,16 +106,16 @@
    <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>
@ -128,15 +128,15 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.tags
-        property='tags'
-        onUpdate=(action 'mappedFieldUpdated')
+        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>
@ -149,12 +149,12 @@
    <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>
@ -169,16 +169,16 @@
    <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')
+      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}}
@ -219,7 +219,7 @@
        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>
@ -236,7 +236,7 @@
        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>
@ -252,7 +252,7 @@
        previewEnabled=false
        barEnabled=false
        wizardFields=wizardFields
-        placeholder='admin.wizard.action.send_to_api.body_placeholder'}}
+        placeholder="admin.wizard.action.send_to_api.body_placeholder"}}
    </div>
  </div>
 {{/if}}
@ -266,16 +266,16 @@
    <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>
@ -290,15 +290,15 @@
    <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>
@ -313,15 +313,15 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.categories
-        property='categories'
-        onUpdate=(action 'mappedFieldUpdated')
+        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>
@ -356,7 +356,7 @@
        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>
@ -379,13 +379,13 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.usernames
-        property='usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        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>
@ -400,13 +400,13 @@
    <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>
@ -418,13 +418,13 @@
    <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>
@ -436,13 +436,13 @@
    <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>
@ -454,13 +454,13 @@
    <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>
@ -472,14 +472,14 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.owner_usernames
-        property='owner_usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="owner_usernames"
+        onUpdate=(action "mappedFieldUpdated")
        options=(hash
          textSelection=true
          wizardFieldSelection=true
          userFieldSelection=true
-          userSelection='output'
-          context='action'
+          userSelection="output"
+          context="action"
        )}}
    </div>
  </div>
@ -491,14 +491,14 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.usernames
-        property='usernames'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="usernames"
+        onUpdate=(action "mappedFieldUpdated")
        options=(hash
          textSelection=true
          wizardFieldSelection=true
          userFieldSelection=true
-          userSelection='output'
-          context='action'
+          userSelection="output"
+          context="action"
        )}}
    </div>
  </div>
@ -510,13 +510,13 @@
    <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>
@ -528,13 +528,13 @@
    <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>
@ -546,13 +546,13 @@
    <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>
@ -564,13 +564,13 @@
    <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>
@ -582,13 +582,13 @@
    <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>
@ -603,13 +603,13 @@
    <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>
@ -622,13 +622,13 @@
    <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>
@ -641,13 +641,13 @@
    <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>
@ -660,13 +660,13 @@
    <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>
@ -679,14 +679,14 @@
    <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>
@ -699,16 +699,16 @@
    <div class="setting-value">
      {{wizard-mapper
        inputs=action.permissions
-        property='permissions'
-        onUpdate=(action 'mappedFieldUpdated')
+        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>
@ -723,22 +723,22 @@
      {{#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')
+              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>
@ -747,20 +747,20 @@
      {{#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>
@ -773,10 +773,10 @@
          </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>
@ -787,10 +787,10 @@
          </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>
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@ -8,7 +8,7 @@

 <div class="setting">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.label'}}</label>
+    <label>{{i18n "admin.wizard.field.label"}}</label>
  </div>
  <div class="setting-value">
    {{input name="label" value=field.label}}
@ -17,18 +17,18 @@

 <div class="setting">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.required'}}</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}}
+    <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>
+    <label>{{i18n "admin.wizard.field.description"}}</label>
  </div>
  <div class="setting-value">
    {{textarea name="description" value=field.description}}
@ -37,7 +37,7 @@

 <div class="setting">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.field.image'}}</label>
+    <label>{{i18n "admin.wizard.field.image"}}</label>
  </div>
  <div class="setting-value">
    {{image-uploader
@ -51,7 +51,7 @@

 <div class="setting">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.type'}}</label>
+    <label>{{i18n "admin.wizard.type"}}</label>
  </div>
  
  <div class="setting-value">
@ -68,12 +68,12 @@
 {{wizard-message
  key=messageKey
  url=messageUrl
-  component='field'}}
+  component="field"}}

 {{#if isTextType}}
  <div class="setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.min_length'}}</label>
+      <label>{{i18n "admin.wizard.field.min_length"}}</label>
    </div>
    
    <div class="setting-value">
@ -87,7 +87,7 @@

  <div class="setting full">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.max_length'}}</label>
+      <label>{{i18n "admin.wizard.field.max_length"}}</label>
    </div>

    <div class="setting-value">
@ -101,11 +101,11 @@

  <div class="setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.char_counter'}}</label>
+      <label>{{i18n "admin.wizard.field.char_counter"}}</label>
    </div>

    <div class="setting-value">
-      <span>{{i18n 'admin.wizard.field.char_counter_placeholder'}}</span>
+      <span>{{i18n "admin.wizard.field.char_counter_placeholder"}}</span>
      {{input
        type="checkbox"
        checked=field.char_counter}}
@ -116,7 +116,7 @@
 {{#if isUpload}}
  <div class="setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.file_types'}}</label>
+      <label>{{i18n "admin.wizard.field.file_types"}}</label>
    </div>
    
    <div class="setting-value">
@ -128,7 +128,7 @@
 {{#if showLimit}}
  <div class="setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.limit'}}</label>
+      <label>{{i18n "admin.wizard.field.limit"}}</label>
    </div>
    
    <div class="setting-value">
@ -140,12 +140,12 @@
 {{#if isDateTime}}
  <div class="setting">
    <div class="setting-label">
-      <label>{{{i18n 'admin.wizard.field.date_time_format.label'}}}</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>{{{i18n 'admin.wizard.field.date_time_format.instructions'}}}</label>
+      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.instructions")}}</label>
    </div>
  </div>
 {{/if}}
@ -153,14 +153,14 @@
 {{#if showPrefill}}
  <div class="setting full field-mapper-setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.prefill'}}</label>
+      <label>{{i18n "admin.wizard.field.prefill"}}</label>
    </div>
    
    <div class="setting-value">
      {{wizard-mapper
        inputs=field.prefill
-        property='prefill'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="prefill"
+        onUpdate=(action "mappedFieldUpdated")
        options=prefillOptions}}
    </div>
  </div>
@ -169,14 +169,14 @@
 {{#if showContent}}
  <div class="setting full field-mapper-setting">
    <div class="setting-label">
-      <label>{{i18n 'admin.wizard.field.content'}}</label>
+      <label>{{i18n "admin.wizard.field.content"}}</label>
    </div>
    
    <div class="setting-value">
      {{wizard-mapper
        inputs=field.content
-        property='content'
-        onUpdate=(action 'mappedFieldUpdated')
+        property="content"
+        onUpdate=(action "mappedFieldUpdated")
        options=contentOptions}}
    </div>
  </div>
@ -191,7 +191,7 @@
      {{#if isCategory}}
        <div class="setting">
          <div class="setting-label">
-            <label>{{i18n 'admin.wizard.field.property'}}</label>
+            <label>{{i18n "admin.wizard.field.property"}}</label>
          </div>
          
          <div class="setting-value">
@ -200,7 +200,7 @@
              content=categoryPropertyTypes
              onChange=(action (mut field.property))
              options=(hash
-                none='admin.wizard.selector.placeholder.property'
+                none="admin.wizard.selector.placeholder.property"
              )}}
          </div>
        </div>
@ -208,7 +208,7 @@
      
      <div class="setting">
        <div class="setting-label">
-          <label>{{i18n 'admin.wizard.translation'}}</label>
+          <label>{{i18n "admin.wizard.translation"}}</label>
        </div>
        <div class="setting-value medium">
          {{input
--- a/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-step.hbs
@ -1,6 +1,6 @@
 <div class="setting">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.title'}}</label>
+    <label>{{i18n "admin.wizard.step.title"}}</label>
  </div>
  <div class="setting-value">
    {{input
@ -11,7 +11,7 @@

 <div class="setting full">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.banner'}}</label>
+    <label>{{i18n "admin.wizard.step.banner"}}</label>
  </div>
  <div class="setting-value">
    {{image-uploader
@ -25,7 +25,7 @@

 <div class="setting full">
  <div class="setting-label">
-    <label>{{i18n 'admin.wizard.step.description'}}</label>
+    <label>{{i18n "admin.wizard.step.description"}}</label>
  </div>
  <div class="setting-value">
    {{wizard-text-editor
@ -40,23 +40,23 @@
    
    <div class="setting full field-mapper-setting">
      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.step.required_data.label'}}</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'
+            inputTypes="validation"
+            inputConnector="and"
+            wizardFieldSelection="value"
+            userFieldSelection="value"
            keyPlaceholder="admin.wizard.submission_key"
-            context='step'
+            context="step"
          )}}
        {{#if step.required_data}}
          <div class="required-data-message">
            <div class="label">
-              {{i18n 'admin.wizard.step.required_data.not_permitted_message'}}
+              {{i18n "admin.wizard.step.required_data.not_permitted_message"}}
            </div>
            {{input value=step.required_data_message}}
          </div>
@ -66,24 +66,24 @@

    <div class="setting full field-mapper-setting">
      <div class="setting-label">
-        <label>{{i18n 'admin.wizard.step.permitted_params.label'}}</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'
+            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>
+        <label>{{i18n "admin.wizard.translation"}}</label>
      </div>
      <div class="setting-value">
        {{input
--- 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>

--- 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>
--- 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}}
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
@ -1,6 +1,6 @@
 <div class="type-selector">
  {{#if hasTypes}}
-    <a {{action "toggleTypes"}} class="active">
+    <a role="button" {{action "toggleTypes"}} class="active">
      {{activeTypeLabel}}
    </a>

@ -10,7 +10,7 @@
          {{wizard-mapper-selector-type
            activeType=activeType
            item=item
-            toggle=(action 'toggleType')}}
+            toggle=(action "toggleType")}}
        {{/each}}
      </div>
    {{/if}}
@ -66,7 +66,7 @@

  {{#if showUser}}
    {{user-selector
-      includeMessageableGroups='true'
+      includeMessageableGroups="true"
      placeholderKey=placeholderKey
      usernames=value
      autocomplete="discourse"
--- 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
    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}}
--- 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'}}
+    {{d-icon "question-circle"}}

-    <a href={{url}} target="_blank">
+    <a href={{url}} target="_blank" rel="noopener noreferrer">
      {{documentation}}
    </a>
  </div>
--- 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>
--- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs
@ -18,20 +18,20 @@
    {{#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}}
--- a/assets/javascripts/wizard/templates/components/field-validators.hbs
+++ b/assets/javascripts/wizard/templates/components/field-validators.hbs
@ -3,7 +3,7 @@
    {{component validation.component field=field type=type validation=validation}}
  {{/each-in}}

-  {{yield (hash perform=(action 'perform') autocomplete="off")}}
+  {{yield (hash perform=(action "perform") autocomplete="off")}}

  {{#each-in field.validations.below as |type validation|}}
    {{component validation.component field=field type=type validation=validation}}
--- 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}}
--- 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>
--- 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>
--- 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}}
+{{input type="checkbox" id=field.id checked=field.value tabindex=field.tabindex}}
--- 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'}}>
+  <button class="wizard-btn toggle-preview" {{action "togglePreview"}} type="button">
    <span class="d-button-label">{{wizard-i18n togglePreviewLabel}}</span>
-</button>
+  </button>

-{{#if field.char_counter}}
+  {{#if field.char_counter}}
    {{char-counter field.value field.max_length}}
-{{/if}}
+  {{/if}}
 </div>
--- 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"
  )}}
--- 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}}
+{{input type="number" step="0.01" id=field.id value=field.value tabindex=field.tabindex}}
--- 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}}
--- 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}}
+{{input type="text" id=field.id value=field.value tabindex=field.tabindex}}
--- a/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field.hbs
@ -1,18 +1,18 @@
 <label for={{field.id}} class="field-label">
-  {{{field.label}}}
+  {{html-safe field.label}}
 </label>

 {{#if field.image}}
-  <div class="field-image"><img src="{{field.image}}"></div>
+  <div class="field-image"><img src={{field.image}}></div>
 {{/if}}

 {{#if field.description}}
-  <div class='field-description'>{{cookedDescription}}</div>
+  <div class="field-description">{{cookedDescription}}</div>
 {{/if}}

 {{#field-validators field=field as |validators|}}
  {{#if inputComponentName}}
-    <div class='input-area'>
+    <div class="input-area">
      {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard autocomplete=validators.autocomplete}}
    </div>
  {{/if}}
@ -25,5 +25,5 @@
 {{/if}}

 {{#if field.errorDescription}}
-  <div class='field-error-description'>{{{field.errorDescription}}}</div>
+  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
 {{/if}}
--- 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>
--- 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>
--- a/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-similar-topics.hbs
@ -5,7 +5,7 @@
    {{/each}}
  </ul>
 {{else}}
-  <a class="show-topics" {{action "toggleShowTopics"}}>
-    {{wizard-i18n 'realtime_validations.similar_topics.show'}}
+  <a role="button" class="show-topics" {{action "toggleShowTopics"}}>
+    {{wizard-i18n "realtime_validations.similar_topics.show"}}
  </a>
 {{/if}}
--- a/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-step.hbs
@ -1,6 +1,6 @@
-<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}}
@ -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}}
--- 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>
--- a/assets/javascripts/wizard/templates/custom.index.hbs
+++ b/assets/javascripts/wizard/templates/custom.index.hbs
@ -1,14 +1,14 @@
 {{#if noWizard}}
-  {{wizard-no-access text=(wizard-i18n 'wizard.none') wizardId=wizardId}}
+  {{wizard-no-access text=(wizard-i18n "wizard.none") wizardId=wizardId}}
 {{else}}
  {{#if requiresLogin}}
-    {{wizard-no-access text=(wizard-i18n 'wizard.requires_login') wizardId=wizardId}}
+    {{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}}
+      {{wizard-no-access text=(wizard-i18n "wizard.not_permitted") wizardId=wizardId}}
    {{else}}
      {{#if completed}}
-        {{wizard-no-access text=(wizard-i18n 'wizard.completed') wizardId=wizardId}}
+        {{wizard-no-access text=(wizard-i18n "wizard.completed") wizardId=wizardId}}
      {{/if}}
    {{/if}}
  {{/if}}
--- 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>