Merge branch 'main' into dont_rely_on_application_route_override

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

@@ -9,8 +9,7 @@
       value=wizardListVal
       content=wizardList
       onChange=(action "changeWizard")
-      options=(hash
+      options=(hash none="admin.wizard.select")
-        none="admin.wizard.select"
+    }}
-      )}}
   </div>
 </section>

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

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

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

@@ -1,6 +1,7 @@
 import { findCustomWizard, updateCachedWizard } from "../models/custom-wizard";
 import I18n from "I18n";
 import DiscourseRoute from "discourse/routes/discourse";
+import bootbox from "bootbox";
 
 export default DiscourseRoute.extend({
   titleToken() {

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

@@ -8,7 +8,12 @@
       {{/if}}
     {{/if}}
 
-    {{d-button label="admin.wizard.api.save" action=(action "save") class="btn-primary" disabled=saveDisabled}}
+    {{d-button
+      label="admin.wizard.api.save"
+      action=(action "save")
+      class="btn-primary"
+      disabled=saveDisabled
+    }}
 
     {{#if showRemove}}
       {{d-button action=(action "remove") label="admin.wizard.api.remove"}}
@@ -62,10 +67,12 @@
           <span>{{authErrorMessage}}</span>
         {{/if}}
       {{/if}}
-      {{d-button label="admin.wizard.api.auth.btn"
+      {{d-button
+        label="admin.wizard.api.auth.btn"
         action=(action "authorize")
         disabled=authDisabled
-                 class="btn-primary"}}
+        class="btn-primary"
+      }}
     {{/if}}
   </div>
 
@@ -99,9 +106,8 @@
           value=api.authType
           content=authorizationTypes
           onChange=(action (mut api.authType))
-          options=(hash
+          options=(hash none="admin.wizard.api.auth.type_none")
-            none="admin.wizard.api.auth.type_none"
+        }}
-          )}}
       </div>
     </div>
 
@@ -110,9 +116,7 @@
         <div class="control-group">
           <label>{{i18n "admin.wizard.api.auth.url"}}</label>
           <div class="controls">
-            <Input
+            <Input @value={{this.api.authUrl}} />
-              @value={{this.api.authUrl}}
-            />
           </div>
         </div>
       {{/if}}
@@ -120,27 +124,21 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.token_url"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.tokenUrl}} />
-            @value={{this.api.tokenUrl}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_id"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.clientId}} />
-            @value={{this.api.clientId}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.client_secret"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.clientSecret}} />
-            @value={{this.api.clientSecret}}
-          />
         </div>
       </div>
 
@@ -157,10 +155,18 @@
                 @value={{this.param.value}}
                 placeholder={{i18n "admin.wizard.value"}}
               />
-              {{d-button action=(action "removeParam") actionParam=param icon="times"}}
+              {{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}}
@@ -169,18 +175,14 @@
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.username"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.username}} />
-            @value={{this.api.username}}
-          />
         </div>
       </div>
 
       <div class="control-group">
         <label>{{i18n "admin.wizard.api.auth.password"}}</label>
         <div class="controls">
-          <Input
+          <Input @value={{this.api.password}} />
-            @value={{this.api.password}}
-          />
         </div>
       </div>
     {{/if}}
@@ -249,7 +251,11 @@
 </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">
@@ -268,33 +274,34 @@
                     placeholder={{i18n "admin.wizard.api.endpoint.url"}}
                     class="endpoint-url"
                   />
-                  {{d-button action=(action "removeEndpoint")
+                  {{d-button
+                    action=(action "removeEndpoint")
                     actionParam=endpoint
                     icon="times"
-                             class="remove-endpoint"}}
+                    class="remove-endpoint"
+                  }}
                 </div>
                 <div class="bottom">
                   {{combo-box
                     content=endpointMethods
                     value=endpoint.method
                     onChange=(action (mut endpoint.method))
-                    options=(hash
+                    options=(hash none="admin.wizard.api.endpoint.method")
-                      none="admin.wizard.api.endpoint.method"
+                  }}
-                    )}}
                   {{combo-box
                     content=contentTypes
                     value=endpoint.content_type
                     onChange=(action (mut endpoint.content_type))
-                    options=(hash
+                    options=(hash none="admin.wizard.api.endpoint.content_type")
-                      none="admin.wizard.api.endpoint.content_type"
+                  }}
-                    )}}
                   {{multi-select
                     value=endpoint.success_codes
                     content=successCodes
                     onChange=(action (mut endpoint.success_codes))
                     options=(hash
                       none="admin.wizard.api.endpoint.success_codes"
-                    )}}
+                    )
+                  }}
                 </div>
               </div>
             </div>
@@ -312,7 +319,8 @@
     {{d-button
       action=(action "clearLogs")
       class="clear-logs"
-      label="admin.wizard.api.log.clear"}}
+      label="admin.wizard.api.log.clear"
+    }}
   </div>
 </div>
 
@@ -332,7 +340,10 @@
             <td>{{logentry.time}}</td>
             <td class="user-image">
               <div class="user-image-inner">
-                <a href={{logentry.userpath}} data-user-card={{logentry.username}}>{{avatar logentry imageSize="medium"}}</a>
+                <a
+                  href={{logentry.userpath}}
+                  data-user-card={{logentry.username}}
+                >{{avatar logentry imageSize="medium"}}</a>
               </div>
             </td>
             <td>{{logentry.status}}</td>

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

@@ -3,14 +3,14 @@
     value=apiName
     content=apiList
     onChange=(route-action "changeApi")
-    options=(hash
+    options=(hash none="admin.wizard.api.select")
-      none="admin.wizard.api.select"
+  }}
-    )}}
 
   {{d-button
     action=(route-action "createApi")
     label="admin.wizard.api.create"
-    icon="plus"}}
+    icon="plus"
+  }}
 </div>
 
 <div class="admin-wizard-container">

assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs

@@ -5,7 +5,8 @@
     {{d-button
       label="admin.wizard.custom_field.add"
       icon="plus"
-      action=(action "addField")}}
+      action=(action "addField")
+    }}
   </div>
 </div>
 
@@ -14,7 +15,8 @@
   opts=messageOpts
   type=messageType
   url=documentationUrl
-  component="custom_fields"}}
+  component="custom_fields"
+}}
 
 <div class="admin-wizard-container">
   {{#if customFields}}
@@ -32,7 +34,8 @@
           {{custom-field-input
             field=field
             removeField=(action "removeField")
-            saveField=(action "saveField")}}
+            saveField=(action "saveField")
+          }}
         {{/each}}
       </tbody>
     </table>

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

@@ -9,7 +9,8 @@
         label="refresh"
         icon="sync"
         action=(action "refresh")
-        class="refresh"}}
+        class="refresh"
+      }}
     </div>
   </div>
 
@@ -31,7 +32,10 @@
             {{#each logs as |log|}}
               <tr>
                 {{#each-in log as |field value|}}
-                  <td class="small">{{wizard-table-field field=field value=value}}</td>
+                  <td class="small">{{wizard-table-field
+                      field=field
+                      value=value
+                    }}</td>
                 {{/each-in}}
               </tr>
             {{/each}}

assets/javascripts/discourse/templates/admin-wizards-logs.hbs

@@ -3,16 +3,16 @@
     value=wizardId
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 </div>
 
 {{wizard-message
   key=messageKey
   opts=messageOpts
   url=documentationUrl
-  component="logs"}}
+  component="logs"
+}}
 
 <div class="admin-wizard-container">
   {{outlet}}

assets/javascripts/discourse/templates/admin-wizards-manager.hbs

@@ -20,22 +20,26 @@
     {{d-button
       id="upload-button"
       label="admin.wizard.manager.upload"
-      action=(action "upload")}}
+      action=(action "upload")
+    }}
     {{d-button
       id="import-button"
       label="admin.wizard.manager.import"
       action=(action "import")
-      disabled=importDisabled}}
+      disabled=importDisabled
+    }}
     {{d-button
       id="export-button"
       label="admin.wizard.manager.export"
       action=(action "export")
-      disabled=exportDisabled}}
+      disabled=exportDisabled
+    }}
     {{d-button
       id="destroy-button"
       label="admin.wizard.manager.destroy"
       action=(action "destroy")
-      disabled=destoryDisabled}}
+      disabled=destoryDisabled
+    }}
   </div>
 </div>
 
@@ -46,7 +50,8 @@
   opts=messageOpts
   items=messageItems
   loading=loading
-  component="manager"}}
+  component="manager"
+}}
 
 <div class="admin-wizard-container">
   <table class="table grid">

assets/javascripts/discourse/templates/admin-wizards-submissions.hbs

@@ -3,16 +3,16 @@
     value=wizardId
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 </div>
 
 {{wizard-message
   key=messageKey
   opts=messageOpts
   url=documentationUrl
-  component="submissions"}}
+  component="submissions"
+}}
 
 <div class="admin-wizard-container">
   {{outlet}}

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

@@ -9,11 +9,23 @@
     <div class="wizard-url">
       {{#if wizard.name}}
         {{#if copiedUrl}}
-          {{d-button class="btn-hover pull-right" icon="copy" label="ip_lookup.copied"}}
+          {{d-button
+            class="btn-hover pull-right"
+            icon="copy"
+            label="ip_lookup.copied"
+          }}
         {{else}}
-          {{d-button action=(action "copyUrl") class="pull-right no-text" icon="copy"}}
+          {{d-button
+            action=(action "copyUrl")
+            class="pull-right no-text"
+            icon="copy"
+          }}
         {{/if}}
-        <a href={{wizardUrl}} target="_blank" rel="noopener noreferrer">{{wizardUrl}}</a>
+        <a
+          href={{wizardUrl}}
+          target="_blank"
+          rel="noopener noreferrer"
+        >{{wizardUrl}}</a>
       {{/if}}
     </div>
   </div>
@@ -43,9 +55,8 @@
           valueProperty="id"
           value=wizard.theme_id
           onChange=(action (mut wizard.theme_id))
-          options=(hash
+          options=(hash none="admin.wizard.no_theme")
-            none="admin.wizard.no_theme"
+        }}
-          )}}
       </div>
     </div>
   </div>
@@ -60,10 +71,7 @@
         <label>{{i18n "admin.wizard.save_submissions"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.save_submissions}} />
-          @type="checkbox"
-          @checked={{this.wizard.save_submissions}}
-        />
         <span>{{i18n "admin.wizard.save_submissions_label"}}</span>
       </div>
     </div>
@@ -73,10 +81,7 @@
         <label>{{i18n "admin.wizard.multiple_submissions"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.multiple_submissions}} />
-          @type="checkbox"
-          @checked={{this.wizard.multiple_submissions}}
-        />
         <span>{{i18n "admin.wizard.multiple_submissions_label"}}</span>
       </div>
     </div>
@@ -86,10 +91,7 @@
         <label>{{i18n "admin.wizard.after_signup"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.after_signup}} />
-          @type="checkbox"
-          @checked={{this.wizard.after_signup}}
-        />
         <span>{{i18n "admin.wizard.after_signup_label"}}</span>
       </div>
     </div>
@@ -99,10 +101,7 @@
         <label>{{i18n "admin.wizard.prompt_completion"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.prompt_completion}} />
-          @type="checkbox"
-          @checked={{this.wizard.prompt_completion}}
-        />
         <span>{{i18n "admin.wizard.prompt_completion_label"}}</span>
       </div>
     </div>
@@ -112,16 +111,14 @@
         <label>{{i18n "admin.wizard.after_time"}}</label>
       </div>
       <div class="setting-value">
-        <Input
+        <Input @type="checkbox" @checked={{this.wizard.after_time}} />
-          @type="checkbox"
-          @checked={{this.wizard.after_time}}
-        />
         <span>{{i18n "admin.wizard.after_time_label"}}</span>
         {{d-button
           action=(action "setNextSessionScheduled")
           translatedLabel=nextSessionScheduledLabel
           class="btn-after-time"
-          icon="far-calendar"}}
+          icon="far-calendar"
+        }}
       </div>
     </div>
 
@@ -131,10 +128,7 @@
           <label>{{i18n "admin.wizard.required"}}</label>
         </div>
         <div class="setting-value">
-          <Input
+          <Input @type="checkbox" @checked={{this.wizard.required}} />
-            @type="checkbox"
-            @checked={{this.wizard.required}}
-          />
           <span>{{i18n "admin.wizard.required_label"}}</span>
         </div>
       </div>
@@ -144,10 +138,7 @@
           <label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
         </div>
         <div class="setting-value">
-          <Input
+          <Input @type="checkbox" @checked={{this.wizard.restart_on_revisit}} />
-            @type="checkbox"
-            @checked={{this.wizard.restart_on_revisit}}
-          />
           <span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
         </div>
       </div>
@@ -167,16 +158,14 @@
               userFieldSelection="key"
               textSelection="value"
               inputConnector="and"
-            )}}
+            )
+          }}
         </div>
       </div>
     {{/wizard-subscription-container}}
   </div>
 
-  {{wizard-links
+  {{wizard-links itemType="step" current=currentStep items=wizard.steps}}
-    itemType="step"
-    current=currentStep
-    items=wizard.steps}}
 
   {{#if currentStep}}
     {{wizard-custom-step
@@ -185,14 +174,16 @@
       currentField=currentField
       wizardFields=wizardFields
       fieldTypes=filteredFieldTypes
-      subscribed=subscribed}}
+      subscribed=subscribed
+    }}
   {{/if}}
 
   {{wizard-links
     itemType="action"
     current=currentAction
     items=wizard.actions
-    generateLabels=true}}
+    generateLabels=true
+  }}
 
   {{#each wizard.actions as |wizardAction|}}
     {{wizard-custom-action
@@ -202,11 +193,17 @@
       apis=apis
       removeAction="removeAction"
       wizardFields=wizardFields
-      fieldTypes=filteredFieldTypes}}
+      fieldTypes=filteredFieldTypes
+    }}
   {{/each}}
 
   <div class="admin-wizard-buttons">
-    <button {{action "save"}} disabled={{disableSave}} class="btn btn-primary" type="button">
+    <button
+      {{action "save"}}
+      disabled={{disableSave}}
+      class="btn btn-primary"
+      type="button"
+    >
       {{i18n "admin.wizard.save"}}
     </button>
 

assets/javascripts/discourse/templates/admin-wizards-wizard.hbs

@@ -3,20 +3,17 @@
     value=wizardListVal
     content=wizardList
     onChange=(route-action "changeWizard")
-    options=(hash
+    options=(hash none="admin.wizard.select")
-      none="admin.wizard.select"
+  }}
-    )}}
 
   {{d-button
     action=(route-action "createWizard")
     label="admin.wizard.create"
-    icon="plus"}}
+    icon="plus"
+  }}
 </div>
 
-{{wizard-message
+{{wizard-message key=messageKey url=messageUrl component="wizard"}}
-  key=messageKey
-  url=messageUrl
-  component="wizard"}}
 
 <div class="admin-wizard-container settings">
   {{outlet}}

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

@@ -1,12 +1,21 @@
 {{#admin-nav}}
   {{nav-item route="adminWizardsWizard" label="admin.wizard.nav_label"}}
-  {{nav-item route="adminWizardsCustomFields" label="admin.wizard.custom_field.nav_label"}}
+  {{nav-item
-  {{nav-item route="adminWizardsSubmissions" label="admin.wizard.submissions.nav_label"}}
+    route="adminWizardsCustomFields"
+    label="admin.wizard.custom_field.nav_label"
+  }}
+  {{nav-item
+    route="adminWizardsSubmissions"
+    label="admin.wizard.submissions.nav_label"
+  }}
   {{#if showApi}}
     {{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="adminWizardsManager"
+    label="admin.wizard.manager.nav_label"
+  }}
 
   <div class="admin-actions">
     {{wizard-subscription-badge}}

assets/javascripts/discourse/templates/components/custom-field-input.hbs

@@ -5,9 +5,8 @@
       feature="custom_field"
       attribute="klass"
       onChange=(action (mut field.klass))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.klass.select")
-        none="admin.wizard.custom_field.klass.select"
+    }}
-      )}}
   </td>
   <td>
     {{wizard-subscription-selector
@@ -15,9 +14,8 @@
       feature="custom_field"
       attribute="type"
       onChange=(action (mut field.type))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.type.select")
-        none="admin.wizard.custom_field.type.select"
+    }}
-      )}}
   </td>
   <td class="input">
     <Input
@@ -30,9 +28,8 @@
       value=field.serializers
       content=serializerContent
       onChange=(action (mut field.serializers))
-      options=(hash
+      options=(hash none="admin.wizard.custom_field.serializers.select")
-        none="admin.wizard.custom_field.serializers.select"
+    }}
-      )}}
   </td>
   <td class="actions">
     {{#if loading}}
@@ -46,16 +43,15 @@
       action=(action "destroy")
       icon="trash-alt"
       class="destroy"
-      disabled=destroyDisabled}}
+      disabled=destroyDisabled
+    }}
     {{d-button
       icon="save"
       action=(action "save")
       disabled=saveDisabled
-      class="save"}}
+      class="save"
-    {{d-button
+    }}
-      action=(action "close")
+    {{d-button action=(action "close") icon="times" disabled=closeDisabled}}
-      icon="times"
-      disabled=closeDisabled}}
   </td>
 {{else}}
   <td><label>{{field.klass}}</label></td>

assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs

@@ -14,7 +14,8 @@
   wizardComposer=true
   fieldId=field.id
   disabled=disableTextarea
-  outletArgs=(hash composer=composer editorType="composer")}}
+  outletArgs=(hash composer=composer editorType="composer")
+}}
 
 <input
   type="file"
@@ -22,4 +23,4 @@
   class="wizard-composer-upload"
   accept={{allowedFileTypes}}
   multiple
-  >
+/>

assets/javascripts/discourse/templates/components/custom-wizard-date-time-input.hbs

@@ -26,9 +26,5 @@
 {{/if}}
 
 {{#if clearable}}
-  {{d-button
+  {{d-button class="clear-date-time" icon="times" action=(action "onClear")}}
-    class="clear-date-time"
-    icon="times"
-    action=(action "onClear")
-  }}
 {{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-editor.hbs

@@ -2,7 +2,7 @@
 
 <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">
         {{html-safe preview}}
       </div>
@@ -18,13 +18,16 @@
                 onExpand=(action b.action b)
                 class=b.className
                 content=popupMenuOptions
-                options=(hash
+                options=(hash popupTitle=b.title icon=b.icon)
-                  popupTitle=b.title
+              }}
-                  icon=b.icon
-                )}}
             {{else}}
               <div>{{d.icon}}</div>
-              <button class="wizard-btn {{b.className}}" {{action b.action b}} title={{b.title}} type="button">
+              <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">{{i18n b.label}}</span>

assets/javascripts/discourse/templates/components/custom-wizard-field-category.hbs

@@ -4,6 +4,5 @@
   whitelist=field.content
   onChange=(action (mut categories))
   tabindex=field.tabindex
-  options=(hash
+  options=(hash maximum=field.limit)
-    maximum=field.limit
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs

@@ -7,10 +7,15 @@
   cannotSeeMention=(action "cannotSeeMention")
   importQuote=(action "importQuote")
   togglePreview=(action "togglePreview")
-  afterRefresh=(action "afterRefresh")}}
+  afterRefresh=(action "afterRefresh")
+}}
 
 <div class="bottom-bar">
-  <button class="wizard-btn toggle-preview" {{action "togglePreview"}} type="button">
+  <button
+    class="wizard-btn toggle-preview"
+    {{action "togglePreview"}}
+    type="button"
+  >
     <span class="d-button-label">{{i18n togglePreviewLabel}}</span>
   </button>
 

assets/javascripts/discourse/templates/components/custom-wizard-field-dropdown.hbs

@@ -4,6 +4,5 @@
   content=field.content
   tabindex=field.tabindex
   onChange=(action "onChangeValue")
-  options=(hash
+  options=(hash none="select_kit.default_header_text")
-    none="select_kit.default_header_text"
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-group.hbs

@@ -6,6 +6,5 @@
   value=field.value
   tabindex=field.tabindex
   onChange=(action (mut field.value))
-  options=(hash
+  options=(hash none="select_kit.default_header_text")
-    none="select_kit.default_header_text"
+}}
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-number.hbs

@@ -6,4 +6,3 @@
   tabindex={{this.field.tabindex}}
   class={{this.fieldClass}}
 />
-

assets/javascripts/discourse/templates/components/custom-wizard-field-tag.hbs

@@ -4,7 +4,5 @@
   tabindex=field.tabindex
   tagGroups=field.tag_groups
   everyTag=true
-  options=(hash
+  options=(hash maximum=field.limit allowAny=field.can_create_tag)
-    maximum=field.limit
+}}
-    allowAny=field.can_create_tag
-  )}}

assets/javascripts/discourse/templates/components/custom-wizard-field-upload.hbs

@@ -1,4 +1,7 @@
-<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}}
     {{i18n "wizard.uploading"}}
   {{else}}
@@ -6,12 +9,18 @@
     {{d-icon "upload"}}
   {{/if}}
 
-  <input disabled={{uploading}} class="hidden-upload-field" type="file" accept={{field.file_types}} style="visibility: hidden; position: absolute;" >
+  <input
+    disabled={{uploading}}
+    class="hidden-upload-field"
+    type="file"
+    accept={{field.file_types}}
+    style="visibility: hidden; position: absolute;"
+  />
 </label>
 
 {{#if field.value}}
   {{#if isImage}}
-    <img src={{field.value.url}}  class="wizard-image-preview">
+    <img src={{field.value.url}} class="wizard-image-preview" />
   {{else}}
     {{field.value.original_filename}}
   {{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-field-user-selector.hbs

@@ -1,4 +1,5 @@
 {{custom-user-selector
   usernames=field.value
   placeholderKey=field.placeholder
-  tabindex=field.tabindex}}
+  tabindex=field.tabindex
+}}

assets/javascripts/discourse/templates/components/custom-wizard-field.hbs

@@ -3,7 +3,7 @@
 </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}}
@@ -13,7 +13,14 @@
 {{#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}}
+      {{component
+        inputComponentName
+        field=field
+        step=step
+        fieldClass=fieldClass
+        wizard=wizard
+        autocomplete=validators.autocomplete
+      }}
     </div>
   {{/if}}
 {{/field-validators}}
@@ -25,5 +32,7 @@
 {{/if}}
 
 {{#if field.errorDescription}}
-  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
+  <div class="field-error-description">{{html-safe
+      field.errorDescription
+    }}</div>
 {{/if}}

assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs

@@ -1,6 +1,10 @@
 <div>{{text}}</div>
 <div class="no-access-gutter">
-  <button class="wizard-btn primary return-to-site" {{action "skip"}} type="button">
+  <button
+    class="wizard-btn primary return-to-site"
+    {{action "skip"}}
+    type="button"
+  >
     {{i18n "wizard.return_to_site" siteName=siteName}}
     {{d-icon "sign-out-alt"}}
   </button>

assets/javascripts/discourse/templates/components/custom-wizard-similar-topic.hbs

@@ -1,4 +1,6 @@
 <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>
+  <div class="blurb">{{date-node topic.created_at}}
+    -
+    {{html-safe topic.blurb}}</div>
 </a>

assets/javascripts/discourse/templates/components/custom-wizard-step.hbs

@@ -5,7 +5,7 @@
 
   {{#if bannerImage}}
     <div class="wizard-step-banner">
-      <img src={{bannerImage}}>
+      <img src={{bannerImage}} />
     </div>
   {{/if}}
 
@@ -26,7 +26,11 @@
     <div class="white"></div>
     <div class="black" style={{barStyle}}></div>
     <div class="screen"></div>
-    <span>{{i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
+    <span>{{i18n
+        "wizard.step"
+        current=step.displayIndex
+        total=wizard.totalSteps
+      }}</span>
   </div>
 
   <div class="wizard-buttons">
@@ -34,22 +38,44 @@
       {{loading-spinner size="small"}}
     {{else}}
       {{#if showQuitButton}}
-        <a href {{action "quit"}} class="action-link quit" tabindex={{secondaryButtonIndex}}>{{i18n "wizard.quit"}}</a>
+        <a
+          href
+          {{action "quit"}}
+          class="action-link quit"
+          tabindex={{secondaryButtonIndex}}
+        >{{i18n "wizard.quit"}}</a>
       {{/if}}
       {{#if showBackButton}}
-        <a href {{action "backStep"}} class="action-link back" tabindex={{secondaryButtonIndex}}>{{i18n "wizard.back"}}</a>
+        <a
+          href
+          {{action "backStep"}}
+          class="action-link back"
+          tabindex={{secondaryButtonIndex}}
+        >{{i18n "wizard.back"}}</a>
       {{/if}}
     {{/if}}
 
     {{#if showNextButton}}
-      <button type="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}}
+      >
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button type="button" class="wizard-btn done" {{action "done"}} disabled={{saving}} tabindex={{primaryButtonIndex}}>
+      <button
+        type="button"
+        class="wizard-btn done"
+        {{action "done"}}
+        disabled={{saving}}
+        tabindex={{primaryButtonIndex}}
+      >
         {{i18n "wizard.done_custom"}}
       </button>
     {{/if}}

assets/javascripts/discourse/templates/components/field-validators.hbs

@@ -1,12 +1,22 @@
 {{#if field.validations}}
   {{#each-in field.validations.above as |type validation|}}
-    {{component validation.component field=field type=type validation=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}}
+    {{component
+      validation.component
+      field=field
+      type=type
+      validation=validation
+    }}
   {{/each-in}}
 {{else}}
   {{yield}}

assets/javascripts/discourse/templates/components/wizard-custom-action.hbs

@@ -3,7 +3,8 @@
     action=(action "undoChanges")
     icon=undoIcon
     label=undoKey
-    class="undo-changes"}}
+    class="undo-changes"
+  }}
 {{/if}}
 
 <div class="setting">
@@ -18,9 +19,7 @@
       attribute="type"
       onChange=(action "changeType")
       wizard=wizard
-      options=(hash
+      options=(hash none="admin.wizard.select_type")
-        none="admin.wizard.select_type"
-      )
     }}
   </div>
 </div>
@@ -34,14 +33,12 @@
     {{combo-box
       value=action.run_after
       content=runAfterContent
-      onChange=(action (mut action.run_after))}}
+      onChange=(action (mut action.run_after))
+    }}
   </div>
 </div>
 
-{{wizard-message
+{{wizard-message key=messageKey url=messageUrl component="action"}}
-  key=messageKey
-  url=messageUrl
-  component="action"}}
 
 {{#if basicTopicFields}}
   <div class="setting full field-mapper-setting">
@@ -58,7 +55,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -76,13 +74,11 @@
         options=(hash
           none="admin.wizard.selector.placeholder.wizard_field"
           isDisabled=showPostBuilder
-        )}}
+        )
+      }}
 
       <div class="setting-gutter">
-        <Input
+        <Input @type="checkbox" @checked={{this.action.post_builder}} />
-          @type="checkbox"
-          @checked={{this.action.post_builder}}
-        />
         <span>{{i18n "admin.wizard.action.post_builder.checkbox"}}</span>
       </div>
     </div>
@@ -97,7 +93,8 @@
       <div class="setting-value editor">
         {{wizard-text-editor
           value=action.post_template
-          wizardFields=wizardFields}}
+          wizardFields=wizardFields
+        }}
       </div>
     </div>
   {{/if}}
@@ -122,7 +119,8 @@
           wizardActionSelection="output"
           outputDefaultSelection="category"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -143,7 +141,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -158,10 +157,9 @@
         property="visible"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
-          wizardFieldSelection=true
+          wizardFieldSelection=true userFieldSelection=true context="action"
-          userFieldSelection=true
+        )
-          context="action"
+      }}
-        )}}
     </div>
   </div>
 
@@ -176,10 +174,8 @@
           inputs=action.add_event
           property="add_event"
           onUpdate=(action "mappedFieldUpdated")
-          options=(hash
+          options=(hash wizardFieldSelection=true context="action")
-            wizardFieldSelection=true
+        }}
-            context="action"
-          )}}
       </div>
     </div>
   {{/if}}
@@ -195,10 +191,8 @@
           inputs=action.add_location
           property="add_location"
           onUpdate=(action "mappedFieldUpdated")
-          options=(hash
+          options=(hash wizardFieldSelection=true context="action")
-            wizardFieldSelection=true
+        }}
-            context="action"
-          )}}
       </div>
     </div>
   {{/if}}
@@ -223,7 +217,8 @@
           userSelection="output"
           outputDefaultSelection="user"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -246,7 +241,8 @@
         wizardActionSelection="value"
         keyDefaultSelection="userField"
         context="action"
-      )}}
+      )
+    }}
   </div>
 {{/if}}
 
@@ -264,7 +260,8 @@
         options=(hash
           isDisabled=action.custom_title_enabled
           none="admin.wizard.action.send_to_api.select_an_api"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -281,7 +278,8 @@
         options=(hash
           isDisabled=apiEmpty
           none="admin.wizard.action.send_to_api.select_an_endpoint"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -296,7 +294,8 @@
         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}}
@@ -320,7 +319,8 @@
           groupSelection="value,output"
           outputDefaultSelection="group"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -343,7 +343,8 @@
           groupSelection="key,value"
           categorySelection="key,value"
           userSelection="key,value"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -366,13 +367,16 @@
           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.watch_categories.mute_remainder"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_categories.mute_remainder"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -384,13 +388,16 @@
           context="action"
           wizardFieldSelection=true
           userFieldSelection="key,value"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.watch_x.notification_level.label"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_x.notification_level.label"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -401,7 +408,8 @@
         options=(hash
           isDisabled=action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -411,10 +419,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.wizard_user}} />
-        @type="checkbox"
-        @checked={{this.action.wizard_user}}
-      />
     </div>
   </div>
 
@@ -433,7 +438,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           userSelection="output"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -456,13 +462,16 @@
           wizardActionSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
   <div class="setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.watch_x.notification_level.label"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.watch_x.notification_level.label"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -473,7 +482,8 @@
         options=(hash
           isDisabled=action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -483,10 +493,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.wizard_user}} />
-        @type="checkbox"
-        @checked={{this.action.wizard_user}}
-      />
     </div>
   </div>
 
@@ -505,7 +512,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           userSelection="output"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -526,7 +534,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -544,7 +553,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -562,7 +572,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -580,7 +591,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -599,7 +611,8 @@
           userFieldSelection=true
           userSelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
@@ -618,12 +631,15 @@
           userFieldSelection=true
           userSelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.grant_trust_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.grant_trust_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -636,12 +652,15 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.mentionable_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.mentionable_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -654,12 +673,15 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.messageable_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.messageable_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -672,12 +694,15 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.visibility_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.visibility_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -690,12 +715,15 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
   <div class="setting full field-mapper-setting">
     <div class="setting-label">
-      <label>{{i18n "admin.wizard.action.create_group.members_visibility_level"}}</label>
+      <label>{{i18n
+          "admin.wizard.action.create_group.members_visibility_level"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -708,7 +736,8 @@
           wizardFieldSelection=true
           userFieldSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -729,7 +758,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -748,7 +778,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -767,7 +798,8 @@
           wizardFieldSelection=true
           userFieldSelection="key,value"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -786,13 +818,16 @@
           wizardFieldSelection=true
           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>
+      <label>{{i18n
+          "admin.wizard.action.create_category.parent_category"
+        }}</label>
     </div>
 
     <div class="setting-value">
@@ -806,7 +841,8 @@
           userFieldSelection="key,value"
           categorySelection="output"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 
@@ -828,7 +864,8 @@
           userFieldSelection=true
           groupSelection="key"
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -852,7 +889,8 @@
           userFieldSelection="value"
           keyPlaceholder="admin.wizard.action.custom_fields.key"
           context=customFieldsContext
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -874,7 +912,8 @@
           userFieldSelection=true
           groupSelection=true
           context="action"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/if}}
@@ -886,10 +925,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.skip_redirect}} />
-        @type="checkbox"
-        @checked={{this.action.skip_redirect}}
-      />
 
       <span>
         {{i18n "admin.wizard.action.skip_redirect.description" type="topic"}}
@@ -903,13 +939,13 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.action.suppress_notifications}} />
-        @type="checkbox"
-        @checked={{this.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>

assets/javascripts/discourse/templates/components/wizard-custom-field.hbs

@@ -3,7 +3,8 @@
     action=(action "undoChanges")
     icon=undoIcon
     label=undoKey
-    class="undo-changes"}}
+    class="undo-changes"
+  }}
 {{/if}}
 
 <div class="setting">
@@ -11,10 +12,7 @@
     <label>{{i18n "admin.wizard.field.label"}}</label>
   </div>
   <div class="setting-value">
-    <Input
+    <Input name="label" @value={{this.field.label}} />
-      name="label"
-      @value={{this.field.label}}
-    />
   </div>
 </div>
 
@@ -25,10 +23,7 @@
 
   <div class="setting-value">
     <span>{{i18n "admin.wizard.field.required_label"}}</span>
-    <Input
+    <Input @type="checkbox" @checked={{this.field.required}} />
-      @type="checkbox"
-      @checked={{this.field.required}}
-    />
   </div>
 </div>
 
@@ -37,10 +32,7 @@
     <label>{{i18n "admin.wizard.field.description"}}</label>
   </div>
   <div class="setting-value">
-    <Textarea
+    <Textarea name="description" @value={{this.field.description}} />
-      name="description"
-      @value={{this.field.description}}
-    />
   </div>
 </div>
 
@@ -55,7 +47,8 @@
       onUploadDeleted=(action "imageUploadDeleted")
       type="wizard-field-image"
       class="no-repeat contain-image"
-      id=(concat "wizard-field-" field.id "-image-upload")}}
+      id=(concat "wizard-field-" field.id "-image-upload")
+    }}
   </div>
 </div>
 
@@ -71,17 +64,12 @@
       attribute="type"
       onChange=(action "changeType")
       wizard=wizard
-      options=(hash
+      options=(hash none="admin.wizard.select_type")
-        none="admin.wizard.select_type"
-      )
     }}
   </div>
 </div>
 
-{{wizard-message
+{{wizard-message key=messageKey url=messageUrl component="field"}}
-  key=messageKey
-  url=messageUrl
-  component="field"}}
 
 {{#if isTextType}}
   <div class="setting">
@@ -121,10 +109,7 @@
 
     <div class="setting-value">
       <span>{{i18n "admin.wizard.field.char_counter_placeholder"}}</span>
-      <Input
+      <Input @type="checkbox" @checked={{this.field.char_counter}} />
-        @type="checkbox"
-        @checked={{this.field.char_counter}}
-      />
     </div>
   </div>
 
@@ -166,10 +151,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @value={{this.field.file_types}} class="medium" />
-        @value={{this.field.file_types}}
-        class="medium"
-      />
     </div>
   </div>
 {{/if}}
@@ -181,11 +163,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="number" @value={{this.field.limit}} class="small" />
-        @type="number"
-        @value={{this.field.limit}}
-        class="small"
-      />
     </div>
   </div>
 {{/if}}
@@ -193,15 +171,16 @@
 {{#if isDateTime}}
   <div class="setting">
     <div class="setting-label">
-      <label>{{html-safe (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
+      <Input @value={{this.field.format}} class="medium" />
-        @value={{this.field.format}}
+      <label>{{html-safe
-        class="medium"
+          (i18n "admin.wizard.field.date_time_format.instructions")
-      />
+        }}</label>
-      <label>{{html-safe (i18n "admin.wizard.field.date_time_format.instructions")}}</label>
     </div>
   </div>
 {{/if}}
@@ -217,7 +196,8 @@
         inputs=field.prefill
         property="prefill"
         onUpdate=(action "mappedFieldUpdated")
-        options=prefillOptions}}
+        options=prefillOptions
+      }}
     </div>
   </div>
 {{/if}}
@@ -233,7 +213,8 @@
         inputs=field.content
         property="content"
         onUpdate=(action "mappedFieldUpdated")
-        options=contentOptions}}
+        options=contentOptions
+      }}
     </div>
   </div>
 {{/if}}
@@ -259,10 +240,7 @@
     </div>
 
     <div class="setting-value">
-      <Input
+      <Input @type="checkbox" @checked={{this.field.can_create_tag}} />
-        @type="checkbox"
-        @checked={{this.field.can_create_tag}}
-      />
     </div>
   </div>
 {{/if}}
@@ -274,9 +252,7 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper
+      {{wizard-mapper inputs=field.condition options=fieldConditionOptions}}
-        inputs=field.condition
-        options=fieldConditionOptions}}
     </div>
   </div>
 
@@ -286,9 +262,7 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper
+      {{wizard-mapper inputs=field.index options=fieldIndexOptions}}
-        inputs=field.index
-        options=fieldIndexOptions}}
     </div>
   </div>
 
@@ -303,9 +277,8 @@
           value=field.property
           content=categoryPropertyTypes
           onChange=(action (mut field.property))
-          options=(hash
+          options=(hash none="admin.wizard.selector.placeholder.property")
-            none="admin.wizard.selector.placeholder.property"
+        }}
-          )}}
       </div>
     </div>
   {{/if}}

assets/javascripts/discourse/templates/components/wizard-custom-step.hbs

@@ -3,10 +3,7 @@
     <label>{{i18n "admin.wizard.step.title"}}</label>
   </div>
   <div class="setting-value">
-    <Input
+    <Input name="title" @value={{this.step.title}} />
-      name="title"
-      @value={{this.step.title}}
-    />
   </div>
 </div>
 
@@ -21,7 +18,8 @@
       onUploadDeleted=(action "bannerUploadDeleted")
       type="wizard-step-banner"
       class="no-repeat contain-image"
-      id=(concat "wizard-step-" step.id "-banner-upload")}}
+      id=(concat "wizard-step-" step.id "-banner-upload")
+    }}
   </div>
 </div>
 
@@ -30,8 +28,7 @@
     <label>{{i18n "admin.wizard.step.description"}}</label>
   </div>
   <div class="setting-value">
-    {{wizard-text-editor
+    {{wizard-text-editor value=step.raw_description}}
-      value=step.raw_description}}
   </div>
 </div>
 
@@ -42,9 +39,7 @@
     </div>
 
     <div class="setting-value">
-      {{wizard-mapper
+      {{wizard-mapper inputs=step.condition options=stepConditionOptions}}
-        inputs=step.condition
-        options=stepConditionOptions}}
     </div>
   </div>
 
@@ -52,10 +47,7 @@
     <div class="setting-label"></div>
     <div class="setting-value force-final">
       <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
-      <Input
+      <Input @type="checkbox" @checked={{this.step.force_final}} />
-        @type="checkbox"
-        @checked={{this.step.force_final}}
-      />
       <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
     </div>
   </div>
@@ -75,15 +67,14 @@
           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
+          <Input @value={{this.step.required_data_message}} />
-            @value={{this.step.required_data_message}}
-          />
         </div>
       {{/if}}
     </div>
@@ -102,7 +93,8 @@
           keyPlaceholder="admin.wizard.param_key"
           valuePlaceholder="admin.wizard.submission_key"
           context="step"
-        )}}
+        )
+      }}
     </div>
   </div>
 {{/wizard-subscription-container}}
@@ -111,7 +103,8 @@
   itemType="field"
   current=currentField
   items=step.fields
-  parentId=step.id}}
+  parentId=step.id
+}}
 
 {{#each step.fields as |field|}}
   {{wizard-custom-field
@@ -122,5 +115,6 @@
     fieldTypes=fieldTypes
     removeField="removeField"
     wizardFields=wizardFields
-    subscribed=subscribed}}
+    subscribed=subscribed
+  }}
 {{/each}}

assets/javascripts/discourse/templates/components/wizard-links.hbs

@@ -4,14 +4,34 @@
   {{#if anyLinks}}
     {{#each links as |link|}}
       <div data-id={{link.id}}>
-        {{d-button action=(action "change") actionParam=link.id translatedLabel=link.label class=link.classes}}
+        {{d-button
+          action=(action "change")
+          actionParam=link.id
+          translatedLabel=link.label
+          class=link.classes
+        }}
         {{#unless link.first}}
-          {{d-button action=(action "back") actionParam=link icon="arrow-left" class="back"}}
+          {{d-button
+            action=(action "back")
+            actionParam=link
+            icon="arrow-left"
+            class="back"
+          }}
         {{/unless}}
         {{#unless link.last}}
-          {{d-button action=(action "forward") actionParam=link icon="arrow-right" class="forward"}}
+          {{d-button
+            action=(action "forward")
+            actionParam=link
+            icon="arrow-right"
+            class="forward"
+          }}
         {{/unless}}
-        {{d-button action=(action "remove") actionParam=link.id icon="times" class="remove"}}
+        {{d-button
+          action=(action "remove")
+          actionParam=link.id
+          icon="times"
+          class="remove"
+        }}
       </div>
     {{/each}}
   {{/if}}

assets/javascripts/discourse/templates/components/wizard-mapper-connector.hbs

@@ -2,7 +2,8 @@
   {{combo-box
     value=connector
     content=connectors
-    onChange=(action "changeConnector")}}
+    onChange=(action "changeConnector")
+  }}
 {{else}}
   {{#if connector}}
     <span class="connector-single">

assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs

@@ -5,7 +5,8 @@
   inputType=inputType
   connectorType="type"
   options=options
-  onUpdate=onUpdate}}
+  onUpdate=onUpdate
+}}
 
 {{#if hasPairs}}
   <div class="mapper-pairs mapper-block">
@@ -16,7 +17,8 @@
         inputType=inputType
         options=options
         removePair=(action "removePair")
-        onUpdate=onUpdate}}
+        onUpdate=onUpdate
+      }}
     {{/each}}
 
     {{#if canAddPair}}
@@ -35,7 +37,8 @@
       connectorType="output"
       inputType=inputType
       options=options
-      onUpdate=onUpdate}}
+      onUpdate=onUpdate
+    }}
   {{/if}}
 
   <div class="output mapper-block">
@@ -45,7 +48,8 @@
       value=input.output
       activeType=input.output_type
       options=options
-      onUpdate=onUpdate}}
+      onUpdate=onUpdate
+    }}
   </div>
 {{/if}}
 

assets/javascripts/discourse/templates/components/wizard-mapper-pair.hbs

@@ -5,7 +5,8 @@
     value=pair.key
     activeType=pair.key_type
     options=options
-    onUpdate=onUpdate}}
+    onUpdate=onUpdate
+  }}
 </div>
 
 {{wizard-mapper-connector
@@ -14,7 +15,8 @@
   connectorType="pair"
   inputType=inputType
   options=options
-  onUpdate=onUpdate}}
+  onUpdate=onUpdate
+}}
 
 <div class="value mapper-block">
   {{wizard-mapper-selector
@@ -24,7 +26,8 @@
     activeType=pair.value_type
     options=options
     onUpdate=onUpdate
-    connector=pair.connector}}
+    connector=pair.connector
+  }}
 </div>
 
 {{#if showJoin}}
@@ -32,5 +35,7 @@
 {{/if}}
 
 {{#if showRemove}}
-  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon "times"}}</a>
+  <a role="button" {{action removePair pair}} class="remove-pair">{{d-icon
+      "times"
+    }}</a>
 {{/if}}

assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs

@@ -10,7 +10,8 @@
           {{wizard-mapper-selector-type
             activeType=activeType
             item=item
-            toggle=(action "toggleType")}}
+            toggle=(action "toggleType")
+          }}
         {{/each}}
       </div>
     {{/if}}
@@ -34,10 +35,8 @@
       value=value
       content=comboBoxContent
       onChange=(action "changeValue")
-      options=(hash
+      options=(hash none=placeholderKey allowAny=comboBoxAllowAny)
-        none=placeholderKey
+    }}
-        allowAny=comboBoxAllowAny
-      )}}
   {{/if}}
 
   {{#if showMultiSelect}}
@@ -45,14 +44,16 @@
       content=multiSelectContent
       value=value
       onChange=(action "changeValue")
-      options=multiSelectOptions}}
+      options=multiSelectOptions
+    }}
   {{/if}}
 
   {{#if showList}}
     {{wizard-value-list
       values=value
       addKey=placeholderKey
-      onChange=(action "changeValue")}}
+      onChange=(action "changeValue")
+    }}
   {{/if}}
 
   {{#if showTag}}
@@ -60,10 +61,8 @@
       tags=value
       onChange=(action "changeValue")
       everyTag=true
-      options=(hash
+      options=(hash none=placeholderKey filterable=true)
-        none=placeholderKey
+    }}
-        filterable=true
-      )}}
   {{/if}}
 
   {{#if showUser}}
@@ -72,8 +71,7 @@
       value=value
       autocomplete="discourse"
       onChange=(action "changeUserValue")
-      options=(hash
+      options=(hash includeMessageableGroups="true")
-        includeMessageableGroups="true"
+    }}
-      )}}
   {{/if}}
 </div>

assets/javascripts/discourse/templates/components/wizard-mapper.hbs

@@ -3,14 +3,16 @@
     {{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")}}
+    onUpdate=(action "inputUpdated")
+  }}
 {{/each}}
 
 {{#if canAdd}}

assets/javascripts/discourse/templates/components/wizard-realtime-validations.hbs

@@ -7,27 +7,31 @@
       <li>
         <span class="setting-title">
           <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
-          <Input
+          <Input @type="checkbox" @checked={{this.props.status}} />
-            @type="checkbox"
-            @checked={{this.props.status}}
-          />
           {{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"))
+                categories=(get
+                  this (concat "validationBuffer." type ".categories")
+                )
                 onChange=(action "updateValidationCategories" type props)
-                  class="wizard"}}
+                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
@@ -39,7 +43,8 @@
                 value=(readonly props.time_unit)
                 content=timeUnits
                 class="time-unit-selector"
-                  onChange=(action (mut props.time_unit))}}
+                onChange=(action (mut props.time_unit))
+              }}
             </div>
           </div>
           <div class="validation-section">
@@ -47,9 +52,17 @@
               <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}}
+              {{radio-button
+                name=(concat type field.id)
+                value="above"
+                selection=props.position
+              }}
               <span>{{i18n "admin.wizard.field.validations.above"}}</span>
-              {{radio-button name=(concat type field.id) value="below" selection=props.position}}
+              {{radio-button
+                name=(concat type field.id)
+                value="below"
+                selection=props.position
+              }}
               <span>{{i18n "admin.wizard.field.validations.below"}}</span>
             </div>
           </div>

assets/javascripts/discourse/templates/components/wizard-subscription-badge.hbs

@@ -1,6 +1,24 @@
-<svg width="300px" height="300px" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg
-  <g id="pavilion-logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+  width="300px"
-    <path id="Combined-Shape" stroke="currentColor" stroke-width="35" d="M41.1381822,291.00006 L40.5778853,130.009744 M258.850727,291.638415 L259.290397,130.37133 M36.0002279,140.721678 L139.995368,36.2122772 M263.350577,141.009083 L138.927245,16.2478517"></path>
+  height="300px"
+  viewBox="0 0 300 300"
+  version="1.1"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+  <g
+    id="pavilion-logo"
+    stroke="none"
+    stroke-width="1"
+    fill="none"
+    fill-rule="evenodd"
+  >
+    <path
+      id="Combined-Shape"
+      stroke="currentColor"
+      stroke-width="35"
+      d="M41.1381822,291.00006 L40.5778853,130.009744 M258.850727,291.638415 L259.290397,130.37133 M36.0002279,140.721678 L139.995368,36.2122772 M263.350577,141.009083 L138.927245,16.2478517"
+    ></path>
   </g>
 </svg>
 <span>{{label}}</span>

assets/javascripts/discourse/templates/components/wizard-subscription-selector/wizard-subscription-selector-header.hbs

@@ -1,6 +1,7 @@
 <div class="select-kit-header-wrapper">
 
-  {{component selectKit.options.selectedNameComponent
+  {{component
+    selectKit.options.selectedNameComponent
     tabindex=tabindex
     item=selectedContent
     selectKit=selectKit

assets/javascripts/discourse/templates/components/wizard-table-field.hbs

@@ -16,7 +16,10 @@
 
   {{#if isComposer}}
     <div class="wizard-table-long-text">
-      <p class="wizard-table-composer-text wizard-table-long-text-content {{textState}}">
+      <p
+        class="wizard-table-composer-text wizard-table-long-text-content
+          {{textState}}"
+      >
         {{value.value}}
       </p>
       <a href {{action "expandText"}}>
@@ -28,7 +31,8 @@
   {{#if isComposerPreview}}
     {{d-icon "comment-alt"}}
     <span class="wizard-table-composer-text">
-      {{i18n "admin.wizard.submissions.composer_preview"}}: {{value.value}}
+      {{i18n "admin.wizard.submissions.composer_preview"}}:
+      {{value.value}}
     </span>
   {{/if}}
 
@@ -146,7 +150,12 @@
   {{/if}}
 
   {{#if showUsername}}
-    <a target="_blank" rel="noopener noreferrer" href={{userProfileUrl}} title={{username}}>
+    <a
+      target="_blank"
+      rel="noopener noreferrer"
+      href={{userProfileUrl}}
+      title={{username}}
+    >
       {{username}}
     </a>
   {{/if}}

assets/javascripts/discourse/templates/components/wizard-text-editor.hbs

@@ -1,19 +1,12 @@
-{{d-editor
+{{d-editor value=value forcePreview=forcePreview placeholder=placeholder}}
-  value=value
-  forcePreview=forcePreview
-  placeholder=placeholder}}
 
 <div class="wizard-editor-gutter">
   {{#if previewEnabled}}
-    {{d-button
+    {{d-button action=(action "togglePreview") translatedLabel=previewLabel}}
-      action=(action "togglePreview")
-      translatedLabel=previewLabel}}
   {{/if}}
 
   {{#if fieldsEnabled}}
-    {{d-button
+    {{d-button action=(action "togglePopover") translatedLabel=popoverLabel}}
-      action=(action "togglePopover")
-      translatedLabel=popoverLabel}}
 
     {{#if showPopover}}
       <div class="wizard-editor-gutter-popover">

assets/javascripts/discourse/templates/custom-wizard-index.hbs

@@ -1,3 +1,7 @@
 {{#if noAccess}}
-  {{custom-wizard-no-access text=(i18n noAccessI18nKey) wizardId=wizardId reason=noAccessReason}}
+  {{custom-wizard-no-access
+    text=(i18n noAccessI18nKey)
+    wizardId=wizardId
+    reason=noAccessReason
+  }}
 {{/if}}

assets/javascripts/discourse/templates/custom-wizard-step.hbs

@@ -16,5 +16,6 @@
     wizard=wizard
     goNext=(action "goNext")
     goBack=(action "goBack")
-    showMessage=(action "showMessage")}}
+    showMessage=(action "showMessage")
+  }}
 {{/if}}

assets/javascripts/discourse/templates/custom-wizard.hbs

@@ -4,7 +4,10 @@
   </div>
   <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>
     {{/if}}

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

@@ -8,7 +8,10 @@
           <div class="left-content">
             <label class="column-name">
               {{input type="checkbox" checked=column.enabled}}
-              {{directory-table-header-title field=column.label translated=true}}
+              {{directory-table-header-title
+                field=column.label
+                translated=true
+              }}
             </label>
           </div>
         </div>

assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs

@@ -12,5 +12,6 @@
     action=(action "submit")
     class="btn-primary"
     label="admin.wizard.after_time_modal.done"
-    disabled=submitDisabled}}
+    disabled=submitDisabled
+  }}
 </div>

package.json

@@ -5,7 +5,7 @@
   "author": "Pavilion",
   "license": "GPL V2",
   "devDependencies": {
-    "eslint-config-discourse": "^1.1.8",
+    "eslint-config-discourse": "^3.4.0",
     "semver": "^7.3.5"
   }
 }

test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js

@@ -4,7 +4,7 @@ import {
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, findAll, visit, waitUntil } from "@ember/test-helpers";
+import { click, fillIn, findAll, visit, waitUntil } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   getCustomFields,

test/javascripts/acceptance/admin-wizards-api-test.js

@@ -1,6 +1,6 @@
 import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, visit } from "@ember/test-helpers";
+import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   getBusinessAdminWizard,
@@ -73,11 +73,11 @@ acceptance("Admin | API tab", function (needs) {
     await fieldTypeDropdown.expand();
     await fieldTypeDropdown.selectRowByValue("basic");
     await fillIn(
-      ".wizard-api-authentication .settings .control-group:eq(1) .controls input",
+      ".wizard-api-authentication .settings .control-group:nth-child(3) .controls input",
       "some_username"
     );
     await fillIn(
-      ".wizard-api-authentication .settings .control-group:eq(2) .controls input",
+      ".wizard-api-authentication .settings .control-group:nth-child(4) .controls input",
       "some_password"
     );
     await click(".wizard-api-endpoints button");

test/javascripts/acceptance/admin-wizards-business-subscription-test.js

@@ -4,7 +4,7 @@ import {
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, findAll, visit } from "@ember/test-helpers";
+import { click, currentURL, fillIn, findAll, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   getAdminTestingWizard,

test/javascripts/acceptance/admin-wizards-standard-subscription-test.js

@@ -4,7 +4,7 @@ import {
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, findAll, visit } from "@ember/test-helpers";
+import { click, currentURL, fillIn, findAll, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   getAdminTestingWizard,

test/javascripts/acceptance/admin-wizards-unsuscribed-test.js

@@ -5,7 +5,7 @@ import {
   visible,
 } from "discourse/tests/helpers/qunit-helpers";
 import { test } from "qunit";
-import { click, findAll, visit } from "@ember/test-helpers";
+import { click, currentURL, fillIn, findAll, visit } from "@ember/test-helpers";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
 import {
   getAdminTestingWizard,