From 31b2625a65ead9bfae52f7513be57727f5c649fb Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:05:55 +0100
Subject: [PATCH 01/20] add this to avoid deprecation

---
 .../components/wizard-custom-action.hbs       | 106 +++++++++---------
 .../components/wizard-mapper-input.hbs        |  36 +++---
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index e6a4b703..80152674 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -14,7 +14,7 @@
 
   <div class="setting-value">
     {{wizard-subscription-selector
-      value=action.type
+      value=this.action.type
       feature="action"
       attribute="type"
       onChange=(action "changeType")
@@ -31,9 +31,9 @@
 
   <div class="setting-value">
     {{combo-box
-      value=action.run_after
+      value=this.action.run_after
       content=runAfterContent
-      onChange=(action (mut action.run_after))
+      onChange=(action (mut this.action.run_after))
     }}
   </div>
 </div>
@@ -48,7 +48,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.title
+        inputs=this.action.title
         property="title"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -67,10 +67,10 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.post
+        value=this.action.post
         content=wizardFields
         nameProperty="label"
-        onChange=(action (mut action.post))
+        onChange=(action (mut this.action.post))
         options=(hash
           none="admin.wizard.selector.placeholder.wizard_field"
           isDisabled=showPostBuilder
@@ -84,7 +84,7 @@
     </div>
   </div>
 
-  {{#if action.post_builder}}
+  {{#if this.action.post_builder}}
     <div class="setting full">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.action.post_builder.label"}}</label>
@@ -92,7 +92,7 @@
 
       <div class="setting-value editor">
         {{wizard-text-editor
-          value=action.post_template
+          value=this.action.post_template
           wizardFields=wizardFields
         }}
       </div>
@@ -108,7 +108,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.category
+        inputs=this.action.category
         property="category"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -131,7 +131,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tags
+        inputs=this.action.tags
         property="tags"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -153,7 +153,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.visible
+        inputs=this.action.visible
         property="visible"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -171,7 +171,7 @@
 
       <div class="setting-value">
         {{wizard-mapper
-          inputs=action.add_event
+          inputs=this.action.add_event
           property="add_event"
           onUpdate=(action "mappedFieldUpdated")
           options=(hash wizardFieldSelection=true context="action")
@@ -188,7 +188,7 @@
 
       <div class="setting-value">
         {{wizard-mapper
-          inputs=action.add_location
+          inputs=this.action.add_location
           property="add_location"
           onUpdate=(action "mappedFieldUpdated")
           options=(hash wizardFieldSelection=true context="action")
@@ -206,7 +206,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.recipient
+        inputs=this.action.recipient
         property="recipient"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -230,7 +230,7 @@
     </div>
 
     {{wizard-mapper
-      inputs=action.profile_updates
+      inputs=this.action.profile_updates
       property="profile_updates"
       onUpdate=(action "mappedFieldUpdated")
       options=(hash
@@ -254,11 +254,11 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.api
+        value=this.action.api
         content=availableApis
-        onChange=(action (mut action.api))
+        onChange=(action (mut this.action.api))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.send_to_api.select_an_api"
         )
       }}
@@ -272,9 +272,9 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.api_endpoint
+        value=this.action.api_endpoint
         content=availableEndpoints
-        onChange=(action (mut action.api_endpoint))
+        onChange=(action (mut this.action.api_endpoint))
         options=(hash
           isDisabled=apiEmpty
           none="admin.wizard.action.send_to_api.select_an_endpoint"
@@ -290,7 +290,7 @@
 
     <div class="setting-value">
       {{wizard-text-editor
-        value=action.api_body
+        value=this.action.api_body
         previewEnabled=false
         barEnabled=false
         wizardFields=wizardFields
@@ -308,7 +308,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.group
+        inputs=this.action.group
         property="group"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -333,7 +333,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.url
+        inputs=this.action.url
         property="url"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -357,7 +357,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.categories
+        inputs=this.action.categories
         property="categories"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -381,7 +381,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.mute_remainder
+        inputs=this.action.mute_remainder
         property="mute_remainder"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -402,11 +402,11 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.notification_level
+        value=this.action.notification_level
         content=availableNotificationLevels
-        onChange=(action (mut action.notification_level))
+        onChange=(action (mut this.action.notification_level))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
         )
       }}
@@ -430,7 +430,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -452,7 +452,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.tags
+        inputs=this.action.tags
         property="tags"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -476,11 +476,11 @@
 
     <div class="setting-value">
       {{combo-box
-        value=action.notification_level
+        value=this.action.notification_level
         content=availableNotificationLevels
-        onChange=(action (mut action.notification_level))
+        onChange=(action (mut this.action.notification_level))
         options=(hash
-          isDisabled=action.custom_title_enabled
+          isDisabled=this.action.custom_title_enabled
           none="admin.wizard.action.watch_x.select_a_notification_level"
         )
       }}
@@ -504,7 +504,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -526,7 +526,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.name
+        inputs=this.action.name
         property="name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -545,7 +545,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.full_name
+        inputs=this.action.full_name
         property="full_name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -564,7 +564,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.title
+        inputs=this.action.title
         property="title"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -583,7 +583,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.bio_raw
+        inputs=this.action.bio_raw
         property="bio_raw"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -602,7 +602,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.owner_usernames
+        inputs=this.action.owner_usernames
         property="owner_usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -622,7 +622,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.usernames
+        inputs=this.action.usernames
         property="usernames"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -644,7 +644,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.grant_trust_level
+        inputs=this.action.grant_trust_level
         property="grant_trust_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -665,7 +665,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.mentionable_level
+        inputs=this.action.mentionable_level
         property="mentionable_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -686,7 +686,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.messageable_level
+        inputs=this.action.messageable_level
         property="messageable_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -707,7 +707,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.visibility_level
+        inputs=this.action.visibility_level
         property="visibility_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -728,7 +728,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.members_visibility_level
+        inputs=this.action.members_visibility_level
         property="members_visibility_level"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -750,7 +750,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.name
+        inputs=this.action.name
         property="name"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -770,7 +770,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.slug
+        inputs=this.action.slug
         property="slug"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -790,7 +790,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.color
+        inputs=this.action.color
         property="color"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -810,7 +810,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.text_color
+        inputs=this.action.text_color
         property="text_color"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -832,7 +832,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.parent_category_id
+        inputs=this.action.parent_category_id
         property="parent_category_id"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -853,7 +853,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.permissions
+        inputs=this.action.permissions
         property="permissions"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -878,7 +878,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.custom_fields
+        inputs=this.action.custom_fields
         property="custom_fields"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
@@ -903,7 +903,7 @@
 
     <div class="setting-value">
       {{wizard-mapper
-        inputs=action.required
+        inputs=this.action.required
         property="required"
         onUpdate=(action "mappedFieldUpdated")
         options=(hash
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
index 4138a254..de1f1d1d 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
@@ -1,11 +1,11 @@
 {{wizard-mapper-connector
-  connector=input.type
-  connectors=inputTypes
+  connector=this.input.type
+  connectors=this.inputTypes
   inputTypes=true
-  inputType=inputType
+  inputType=this.inputType
   connectorType="type"
-  options=options
-  onUpdate=onUpdate
+  options=this.options
+  onUpdate=this.onUpdate
 }}
 
 {{#if hasPairs}}
@@ -14,10 +14,10 @@
       {{wizard-mapper-pair
         pair=pair
         last=pair.last
-        inputType=inputType
-        options=options
+        inputType=this.inputType
+        options=this.options
         removePair=(action "removePair")
-        onUpdate=onUpdate
+        onUpdate=this.onUpdate
       }}
     {{/each}}
 
@@ -32,23 +32,23 @@
 {{#if hasOutput}}
   {{#if hasPairs}}
     {{wizard-mapper-connector
-      connector=input.output_connector
-      connectors=connectors
+      connector=this.input.output_connector
+      connectors=this.connectors
       connectorType="output"
-      inputType=inputType
-      options=options
-      onUpdate=onUpdate
+      inputType=this.inputType
+      options=this.options
+      onUpdate=this.onUpdate
     }}
   {{/if}}
 
   <div class="output mapper-block">
     {{wizard-mapper-selector
       selectorType="output"
-      inputType=input.type
-      value=input.output
-      activeType=input.output_type
-      options=options
-      onUpdate=onUpdate
+      inputType=this.input.type
+      value=this.input.output
+      activeType=this.input.output_type
+      options=this.options
+      onUpdate=this.onUpdate
     }}
   </div>
 {{/if}}

From 6c0d7a671ee933ee0869640dcfb8a7d529a5bb8a Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:18:47 +0100
Subject: [PATCH 02/20] more this additions

---
 .../discourse/templates/components/wizard-mapper-input.hbs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
index de1f1d1d..d21a90c0 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
@@ -10,7 +10,7 @@
 
 {{#if hasPairs}}
   <div class="mapper-pairs mapper-block">
-    {{#each input.pairs as |pair|}}
+    {{#each this.input.pairs as |pair|}}
       {{wizard-mapper-pair
         pair=pair
         last=pair.last
@@ -53,6 +53,6 @@
   </div>
 {{/if}}
 
-<a role="button" class="remove-input" {{action remove input}}>
+<a role="button" class="remove-input" {{action remove this.input}}>
   {{d-icon "times"}}
 </a>
\ No newline at end of file

From 31f917ec80e9957a5e9936dac5df78e8f2e18b83 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:34:18 +0100
Subject: [PATCH 03/20] fix replaceWith calling style deprecation

---
 .../javascripts/discourse/routes/custom-wizard-index.js.es6  | 5 ++++-
 .../javascripts/discourse/routes/custom-wizard-step.js.es6   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/routes/custom-wizard-index.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
index 5ffe83c6..d024a0de 100644
--- a/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
@@ -1,11 +1,14 @@
 import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
+import { inject as service } from '@ember/service';
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
     const wizard = getCachedWizard();
     if (wizard && wizard.permitted && !wizard.completed && wizard.start) {
-      this.replaceWith("customWizardStep", wizard.start);
+      this.router.replaceWith("customWizardStep", wizard.start);
     }
   },
 
diff --git a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
index a882340b..c7ba1cf6 100644
--- a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
@@ -3,14 +3,17 @@ import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { action } from "@ember/object";
+import { inject as service } from '@ember/service';
 
 export default Route.extend({
+  router: service(),
+
   beforeModel() {
     const wizard = getCachedWizard();
     this.set("wizard", wizard);
 
     if (!wizard || !wizard.permitted || wizard.completed) {
-      this.replaceWith("customWizard");
+      this.router.replaceWith("customWizard");
     }
   },
 

From e6f44b7dfcf5ec73e07944559b2cbe2880eba59a Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:42:12 +0100
Subject: [PATCH 04/20] resolve a batch of router deprecations

---
 .../discourse/routes/admin-wizards-api-show.js.es6    |  5 ++++-
 .../discourse/routes/admin-wizards-api.js.es6         |  9 ++++++---
 .../discourse/routes/admin-wizards-logs-show.js.es6   |  5 ++++-
 .../discourse/routes/admin-wizards-logs.js.es6        |  5 ++++-
 .../routes/admin-wizards-submissions-show.js.es6      |  5 ++++-
 .../discourse/routes/admin-wizards-submissions.js.es6 |  5 ++++-
 .../discourse/routes/admin-wizards-wizard-show.js.es6 |  5 ++++-
 .../discourse/routes/admin-wizards-wizard.js.es6      | 11 +++++++----
 .../javascripts/discourse/routes/admin-wizards.js.es6 |  5 ++++-
 .../discourse/routes/custom-wizard-step.js.es6        |  2 +-
 10 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
index bfe90f72..b405cf95 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
@@ -1,7 +1,10 @@
 import CustomWizardApi from "../models/custom-wizard-api";
 import DiscourseRoute from "discourse/routes/discourse";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     if (params.name === "create") {
       return CustomWizardApi.create({ isNew: true });
@@ -12,7 +15,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsApi");
+      return this.router.transitionTo("adminWizardsApi");
     }
   },
 
diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
index 541ab028..e96160a6 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import CustomWizardApi from "../models/custom-wizard-api";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return CustomWizardApi.list();
   },
@@ -25,11 +28,11 @@ export default DiscourseRoute.extend({
   actions: {
     changeApi(apiName) {
       this.controllerFor("adminWizardsApi").set("apiName", apiName);
-      this.transitionTo("adminWizardsApiShow", apiName);
+      this.router.transitionTo("adminWizardsApiShow", apiName);
     },
 
     afterDestroy() {
-      this.transitionTo("adminWizardsApi").then(() => this.refresh());
+      this.router.transitionTo("adminWizardsApi").then(() => this.refresh());
     },
 
     afterSave(apiName) {
@@ -38,7 +41,7 @@ export default DiscourseRoute.extend({
 
     createApi() {
       this.controllerFor("adminWizardsApi").set("apiName", "create");
-      this.transitionTo("adminWizardsApiShow", "create");
+      this.router.transitionTo("adminWizardsApiShow", "create");
     },
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
index e1f53c8f..497f66cf 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
@@ -1,15 +1,18 @@
 import CustomWizardLogs from "../models/custom-wizard-logs";
 import DiscourseRoute from "discourse/routes/discourse";
 import { A } from "@ember/array";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     return CustomWizardLogs.list(params.wizardId);
   },
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsLogs");
+      return this.router.transitionTo("adminWizardsLogs");
     }
   },
 
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
index a1575050..414dc87c 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax(`/admin/wizards/wizard`);
   },
@@ -18,7 +21,7 @@ export default DiscourseRoute.extend({
   actions: {
     changeWizard(wizardId) {
       this.controllerFor("adminWizardsLogs").set("wizardId", wizardId);
-      this.transitionTo("adminWizardsLogsShow", wizardId);
+      this.router.transitionTo("adminWizardsLogsShow", wizardId);
     },
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
index b9dbd90f..4f267b49 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
@@ -2,15 +2,18 @@ import { A } from "@ember/array";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import DiscourseRoute from "discourse/routes/discourse";
 import { formatModel } from "../lib/wizard-submission";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     return CustomWizardAdmin.submissions(params.wizardId);
   },
 
   afterModel(model) {
     if (model === null) {
-      return this.transitionTo("adminWizardsSubmissions");
+      return this.router.transitionTo("adminWizardsSubmissions");
     }
   },
 
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
index 9ecb183d..3229bd8c 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax(`/admin/wizards/wizard`);
   },
@@ -18,7 +21,7 @@ export default DiscourseRoute.extend({
   actions: {
     changeWizard(wizardId) {
       this.controllerFor("adminWizardsSubmissions").set("wizardId", wizardId);
-      this.transitionTo("adminWizardsSubmissionsShow", wizardId);
+      this.router.transitionTo("adminWizardsSubmissionsShow", wizardId);
     },
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
index f55ff19e..2dde4788 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
@@ -2,8 +2,11 @@ import CustomWizardAdmin from "../models/custom-wizard-admin";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model(params) {
     if (params.wizardId === "create") {
       return { create: true };
@@ -14,7 +17,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model) {
     if (model.none) {
-      return this.transitionTo("adminWizardsWizard");
+      return this.router.transitionTo("adminWizardsWizard");
     }
   },
 
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
index b23b63f6..6c984b48 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
@@ -4,8 +4,11 @@ import EmberObject, { set } from "@ember/object";
 import { A } from "@ember/array";
 import { all } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax("/admin/wizards/wizard");
   },
@@ -80,14 +83,14 @@ export default DiscourseRoute.extend({
       this.controllerFor("adminWizardsWizard").set("wizardId", wizardId);
 
       if (wizardId) {
-        this.transitionTo("adminWizardsWizardShow", wizardId);
+        this.router.transitionTo("adminWizardsWizardShow", wizardId);
       } else {
-        this.transitionTo("adminWizardsWizard");
+        this.router.transitionTo("adminWizardsWizard");
       }
     },
 
     afterDestroy() {
-      this.transitionTo("adminWizardsWizard").then(() => this.refresh());
+      this.router.transitionTo("adminWizardsWizard").then(() => this.refresh());
     },
 
     afterSave(wizardId) {
@@ -96,7 +99,7 @@ export default DiscourseRoute.extend({
 
     createWizard() {
       this.controllerFor("adminWizardsWizard").set("wizardId", "create");
-      this.transitionTo("adminWizardsWizardShow", "create");
+      this.router.transitionTo("adminWizardsWizardShow", "create");
     },
   },
 });
diff --git a/assets/javascripts/discourse/routes/admin-wizards.js.es6 b/assets/javascripts/discourse/routes/admin-wizards.js.es6
index 1fa786d3..b29fccec 100644
--- a/assets/javascripts/discourse/routes/admin-wizards.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards.js.es6
@@ -1,7 +1,10 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
+import { inject as service } from '@ember/service';
 
 export default DiscourseRoute.extend({
+  router: service(),
+
   model() {
     return ajax("/admin/wizards");
   },
@@ -17,7 +20,7 @@ export default DiscourseRoute.extend({
 
   afterModel(model, transition) {
     if (transition.targetName === "adminWizards.index") {
-      this.transitionTo("adminWizardsWizard");
+      this.router.transitionTo("adminWizardsWizard");
     }
   },
 });
diff --git a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
index c7ba1cf6..1ad41fbf 100644
--- a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
@@ -30,7 +30,7 @@ export default Route.extend({
 
   afterModel(model) {
     if (model.completed) {
-      return this.transitionTo("wizard.index");
+      return this.router.transitionTo("wizard.index");
     }
     return model.set("wizardId", this.wizard.id);
   },

From 33a320021f4a746d722c85bd348328d89b26a428 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:47:52 +0100
Subject: [PATCH 05/20] linting

---
 .../javascripts/discourse/routes/admin-wizards-api-show.js.es6  | 2 +-
 assets/javascripts/discourse/routes/admin-wizards-api.js.es6    | 2 +-
 .../javascripts/discourse/routes/admin-wizards-logs-show.js.es6 | 2 +-
 assets/javascripts/discourse/routes/admin-wizards-logs.js.es6   | 2 +-
 .../discourse/routes/admin-wizards-submissions-show.js.es6      | 2 +-
 .../discourse/routes/admin-wizards-submissions.js.es6           | 2 +-
 .../discourse/routes/admin-wizards-wizard-show.js.es6           | 2 +-
 assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 | 2 +-
 assets/javascripts/discourse/routes/admin-wizards.js.es6        | 2 +-
 assets/javascripts/discourse/routes/custom-wizard-index.js.es6  | 2 +-
 assets/javascripts/discourse/routes/custom-wizard-step.js.es6   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
index b405cf95..a431e9ae 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6
@@ -1,6 +1,6 @@
 import CustomWizardApi from "../models/custom-wizard-api";
 import DiscourseRoute from "discourse/routes/discourse";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
index e96160a6..2b108460 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import CustomWizardApi from "../models/custom-wizard-api";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
index 497f66cf..9c096a1e 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6
@@ -1,7 +1,7 @@
 import CustomWizardLogs from "../models/custom-wizard-logs";
 import DiscourseRoute from "discourse/routes/discourse";
 import { A } from "@ember/array";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
index 414dc87c..6bb5864b 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
index 4f267b49..e9bad625 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6
@@ -2,7 +2,7 @@ import { A } from "@ember/array";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import DiscourseRoute from "discourse/routes/discourse";
 import { formatModel } from "../lib/wizard-submission";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
index 3229bd8c..dc0ef5e0 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
index 2dde4788..2ed2627f 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6
@@ -2,7 +2,7 @@ import CustomWizardAdmin from "../models/custom-wizard-admin";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 import I18n from "I18n";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
index 6c984b48..6ae31e82 100644
--- a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6
@@ -4,7 +4,7 @@ import EmberObject, { set } from "@ember/object";
 import { A } from "@ember/array";
 import { all } from "rsvp";
 import { ajax } from "discourse/lib/ajax";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/admin-wizards.js.es6 b/assets/javascripts/discourse/routes/admin-wizards.js.es6
index b29fccec..ff8a949a 100644
--- a/assets/javascripts/discourse/routes/admin-wizards.js.es6
+++ b/assets/javascripts/discourse/routes/admin-wizards.js.es6
@@ -1,6 +1,6 @@
 import DiscourseRoute from "discourse/routes/discourse";
 import { ajax } from "discourse/lib/ajax";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default DiscourseRoute.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/custom-wizard-index.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
index d024a0de..78495607 100644
--- a/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard-index.js.es6
@@ -1,6 +1,6 @@
 import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
index 1ad41fbf..963307e7 100644
--- a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6
@@ -3,7 +3,7 @@ import { getCachedWizard } from "../models/custom-wizard";
 import Route from "@ember/routing/route";
 import { scrollTop } from "discourse/mixins/scroll-top";
 import { action } from "@ember/object";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default Route.extend({
   router: service(),

From 742239b0233b34ffc95d615fa34e163dac2e6046 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:58:34 +0100
Subject: [PATCH 06/20] add router service to controllers to avoid deprecation

---
 .../discourse/controllers/admin-wizards-api-show.js.es6     | 5 ++++-
 .../discourse/controllers/custom-wizard-step.js.es6         | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index c08e820c..66b62da2 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -7,8 +7,11 @@ import { selectKitContent } from "../lib/wizard";
 import { underscore } from "@ember/string";
 import Controller from "@ember/controller";
 import I18n from "I18n";
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
+  router: service(),
+
   queryParams: ["refresh_list"],
   loadingSubscriptions: false,
   notAuthorized: not("api.authorized"),
@@ -248,7 +251,7 @@ export default Controller.extend({
         .catch(popupAjaxError)
         .then((result) => {
           if (result.success) {
-            this.transitionToRoute("adminWizardsApis").then(() => {
+            this.router.transitionToRoute("adminWizardsApis").then(() => {
               this.send("refreshModel");
             });
           }
diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index 2dca2e70..7efd9782 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -1,7 +1,9 @@
 import Controller from "@ember/controller";
 import getUrl from "discourse-common/lib/get-url";
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
+  router: service(),
   wizard: null,
   step: null,
 
@@ -15,12 +17,12 @@ export default Controller.extend({
         const wizardId = this.get("wizard.id");
         window.location.href = getUrl(`/w/${wizardId}/steps/${nextStepId}`);
       } else {
-        this.transitionToRoute("customWizardStep", nextStepId);
+        this.router.transitionToRoute("customWizardStep", nextStepId);
       }
     },
 
     goBack() {
-      this.transitionToRoute("customWizardStep", this.get("step.previous"));
+      this.router.transitionToRoute("customWizardStep", this.get("step.previous"));
     },
 
     showMessage(message) {

From 3c17ef574ec978d22bde7c3ab7d07f5b62029b47 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 14:59:22 +0100
Subject: [PATCH 07/20] linting

---
 .../discourse/controllers/admin-wizards-api-show.js.es6         | 2 +-
 .../javascripts/discourse/controllers/custom-wizard-step.js.es6 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index 66b62da2..f847422e 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -7,7 +7,7 @@ import { selectKitContent } from "../lib/wizard";
 import { underscore } from "@ember/string";
 import Controller from "@ember/controller";
 import I18n from "I18n";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   router: service(),
diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index 7efd9782..7b248474 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -1,6 +1,6 @@
 import Controller from "@ember/controller";
 import getUrl from "discourse-common/lib/get-url";
-import { inject as service } from '@ember/service';
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   router: service(),

From 27596a1624b36a036b57c5865b537783efacfda4 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 15:03:15 +0100
Subject: [PATCH 08/20] linting

---
 .../discourse/controllers/custom-wizard-step.js.es6          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index 7b248474..f38747d1 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -22,7 +22,10 @@ export default Controller.extend({
     },
 
     goBack() {
-      this.router.transitionToRoute("customWizardStep", this.get("step.previous"));
+      this.router.transitionToRoute(
+        "customWizardStep",
+        this.get("step.previous")
+      );
     },
 
     showMessage(message) {

From d71d9976b81594c7d2ef97817845f87b9313f0e0 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 15:05:54 +0100
Subject: [PATCH 09/20] bump patch

---
 plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.rb b/plugin.rb
index ef83b548..40b30334 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.4.20
+# version: 2.4.21
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech

From 6572b32706961bf45bdfe343dba2318704c2da06 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 19:14:44 +0100
Subject: [PATCH 10/20] move modals to glimmer components

---
 .../modal/admin-wizards-columns.hbs           | 35 +++++++++++++++++++
 .../components/modal/admin-wizards-columns.js | 14 ++++++++
 .../modal/next-session-scheduled.hbs          | 20 +++++++++++
 .../modal/next-session-scheduled.js           | 29 +++++++++++++++
 .../controllers/admin-wizards-columns.js.es6  | 14 --------
 .../admin-wizards-submissions-show.js.es6     |  6 ++--
 .../admin-wizards-wizard-show.js.es6          |  8 +++--
 .../controllers/next-session-scheduled.js.es6 | 30 ----------------
 .../templates/modal/admin-wizards-columns.hbs | 35 -------------------
 .../modal/next-session-scheduled.hbs          | 17 ---------
 10 files changed, 107 insertions(+), 101 deletions(-)
 create mode 100644 assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
 create mode 100644 assets/javascripts/discourse/components/modal/admin-wizards-columns.js
 create mode 100644 assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
 create mode 100644 assets/javascripts/discourse/components/modal/next-session-scheduled.js
 delete mode 100644 assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
 delete mode 100644 assets/javascripts/discourse/controllers/next-session-scheduled.js.es6
 delete mode 100644 assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
 delete mode 100644 assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs

diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
new file mode 100644
index 00000000..f83a92a0
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
@@ -0,0 +1,35 @@
+<DModal @closeModal={{@closeModal}} @title={{this.title}}>
+  {{#if loading}}
+    <LoadingSpinner size="large" />
+  {{else}}
+    <div class="edit-directory-columns-container">
+      {{#each this.args.model.columns as |column|}}
+        <div class="edit-directory-column">
+          <div class="left-content">
+            <label class="column-name">
+              <Input @type="checkbox" @checked={{column.enabled}} />
+              {{directory-table-header-title
+                field=column.label
+                translated=true
+              }}
+            </label>
+          </div>
+        </div>
+      {{/each}}
+    </div>
+  {{/if}}
+  <div class="modal-footer">
+    <DButton
+      class="btn-primary"
+      @label="directory.edit_columns.save"
+      @action={{action "save"}}
+    />
+
+    <DButton
+      class="btn-secondary reset-to-default"
+      @label="directory.edit_columns.reset_to_default"
+      @action={{action "resetToDefault"}}
+    />
+  </div>
+</DModal>
+
diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.js b/assets/javascripts/discourse/components/modal/admin-wizards-columns.js
new file mode 100644
index 00000000..87c6673f
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.js
@@ -0,0 +1,14 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+
+export default class AdminWizardsColumnComponent extends Component {
+  title = I18n.t("admin.wizard.edit_columns");
+
+  @action save() {
+    this.args.closeModal();
+  }
+
+  @action resetToDefault() {
+    this.args.model.reset();
+  }
+}
diff --git a/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
new file mode 100644
index 00000000..62d291f2
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
@@ -0,0 +1,20 @@
+<DModal
+  @closeModal={{@closeModal}}
+  class="next-session-time-modal"
+  @title={{this.title}}
+>
+  <DateTimeInput
+    @date={{this.bufferedDateTime}}
+    @onChange={{action "dateTimeChanged"}}
+    @showTime="true"
+    @clearable="true"
+  />
+  <div class="modal-footer">
+    <DButton
+      @action={{action "submit"}}
+      class="btn-primary"
+      @label="admin.wizard.after_time_modal.done"
+      disabled={{this.submitDisabled}}
+    />
+  </div>
+</DModal>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/modal/next-session-scheduled.js b/assets/javascripts/discourse/components/modal/next-session-scheduled.js
new file mode 100644
index 00000000..890ecc73
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/next-session-scheduled.js
@@ -0,0 +1,29 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+
+export default class NextSessionScheduledComponent extends Component {
+  @tracked bufferedDateTime;
+  title = I18n.t("admin.wizard.after_time_modal.title");
+
+  constructor() {
+    super(...arguments);
+    this.bufferedDateTime = this.args.model.dateTime
+      ? moment(this.args.model.dateTime)
+      : moment(Date.now());
+  }
+
+  get submitDisabled() {
+    return moment().isAfter(this.bufferedDateTime);
+  }
+
+  @action submit() {
+    const dateTime = this.bufferedDateTime;
+    this.args.model.update(moment(dateTime).utc().toISOString());
+    this.args.closeModal();
+  }
+
+  @action dateTimeChanged(dateTime) {
+    this.bufferedDateTime = dateTime;
+  }
+}
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
deleted file mode 100644
index 4754c577..00000000
--- a/assets/javascripts/discourse/controllers/admin-wizards-columns.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-import Controller from "@ember/controller";
-import ModalFunctionality from "discourse/mixins/modal-functionality";
-
-export default Controller.extend(ModalFunctionality, {
-  actions: {
-    save() {
-      this.send("closeModal");
-    },
-
-    resetToDefault() {
-      this.get("model.reset")();
-    },
-  },
-});
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
index 41dabbb4..dfcf3b7e 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
@@ -2,11 +2,13 @@ import Controller from "@ember/controller";
 import { empty } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 import { fmt } from "discourse/lib/computed";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import AdminWizardsColumnsModal from "../components/modal/admin-wizards-columns";
 import CustomWizardAdmin from "../models/custom-wizard-admin";
 import { formatModel } from "../lib/wizard-submission";
 
 export default Controller.extend({
+  modal: service(),
   downloadUrl: fmt("wizard.id", "/admin/wizards/submissions/%@/download"),
   noResults: empty("submissions"),
   page: 0,
@@ -57,7 +59,7 @@ export default Controller.extend({
     },
 
     showEditColumnsModal() {
-      return showModal("admin-wizards-columns", {
+      return this.modal.show(AdminWizardsColumnsModal, {
         model: {
           columns: this.get("fields"),
           reset: () => {
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index 75ea0ff7..6fa38b0b 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -3,7 +3,8 @@ import {
   observes,
 } from "discourse-common/utils/decorators";
 import { notEmpty } from "@ember/object/computed";
-import showModal from "discourse/lib/show-modal";
+import { inject as service } from "@ember/service";
+import NextSessionScheduledModal from "../components/modal/next-session-scheduled";
 import { generateId, wizardFieldList } from "../lib/wizard";
 import { dasherize } from "@ember/string";
 import { later, scheduleOnce } from "@ember/runloop";
@@ -13,6 +14,7 @@ import I18n from "I18n";
 import { filterValues } from "discourse/plugins/discourse-custom-wizard/discourse/lib/wizard-schema";
 
 export default Controller.extend({
+  modal: service(),
   hasName: notEmpty("wizard.name"),
 
   @observes("currentStep")
@@ -126,7 +128,7 @@ export default Controller.extend({
     },
 
     setNextSessionScheduled() {
-      let controller = showModal("next-session-scheduled", {
+      this.modal.show(NextSessionScheduledModal, {
         model: {
           dateTime: this.wizard.after_time_scheduled,
           update: (dateTime) =>
@@ -134,7 +136,7 @@ export default Controller.extend({
         },
       });
 
-      controller.setup();
+      // controller.setup();
     },
 
     copyUrl() {
diff --git a/assets/javascripts/discourse/controllers/next-session-scheduled.js.es6 b/assets/javascripts/discourse/controllers/next-session-scheduled.js.es6
deleted file mode 100644
index b8f51d1f..00000000
--- a/assets/javascripts/discourse/controllers/next-session-scheduled.js.es6
+++ /dev/null
@@ -1,30 +0,0 @@
-import { default as discourseComputed } from "discourse-common/utils/decorators";
-import Controller from "@ember/controller";
-
-export default Controller.extend({
-  title: "admin.wizard.after_time_modal.title",
-
-  setup() {
-    this.set(
-      "bufferedDateTime",
-      this.model.dateTime ? moment(this.model.dateTime) : moment(Date.now())
-    );
-  },
-
-  @discourseComputed("bufferedDateTime")
-  submitDisabled(dateTime) {
-    return moment().isAfter(dateTime);
-  },
-
-  actions: {
-    submit() {
-      const dateTime = this.get("bufferedDateTime");
-      this.get("model.update")(moment(dateTime).utc().toISOString());
-      this.send("closeModal");
-    },
-
-    dateTimeChanged(dateTime) {
-      this.set("bufferedDateTime", dateTime);
-    },
-  },
-});
diff --git a/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
deleted file mode 100644
index b37a92bf..00000000
--- a/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
+++ /dev/null
@@ -1,35 +0,0 @@
-{{#d-modal-body title="admin.wizard.edit_columns"}}
-  {{#if loading}}
-    {{loading-spinner size="large"}}
-  {{else}}
-    <div class="edit-directory-columns-container">
-      {{#each model.columns as |column|}}
-        <div class="edit-directory-column">
-          <div class="left-content">
-            <label class="column-name">
-              {{input type="checkbox" checked=column.enabled}}
-              {{directory-table-header-title
-                field=column.label
-                translated=true
-              }}
-            </label>
-          </div>
-        </div>
-      {{/each}}
-    </div>
-  {{/if}}
-{{/d-modal-body}}
-
-<div class="modal-footer">
-  {{d-button
-    class="btn-primary"
-    label="directory.edit_columns.save"
-    action=(action "save")
-  }}
-
-  {{d-button
-    class="btn-secondary reset-to-default"
-    label="directory.edit_columns.reset_to_default"
-    action=(action "resetToDefault")
-  }}
-</div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
deleted file mode 100644
index c7e52a56..00000000
--- a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#d-modal-body class="next-session-time-modal" title=title}}
-  {{date-time-input
-    date=bufferedDateTime
-    onChange=(action "dateTimeChanged")
-    showTime=true
-    clearable=true
-  }}
-{{/d-modal-body}}
-
-<div class="modal-footer">
-  {{d-button
-    action=(action "submit")
-    class="btn-primary"
-    label="admin.wizard.after_time_modal.done"
-    disabled=submitDisabled
-  }}
-</div>
\ No newline at end of file

From 76c359be3b3905d23834fe723b9de548bf5e6b2f Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 19:16:59 +0100
Subject: [PATCH 11/20] linting

---
 .../discourse/components/modal/admin-wizards-columns.hbs       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
index f83a92a0..1a8f7fbb 100644
--- a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
@@ -31,5 +31,4 @@
       @action={{action "resetToDefault"}}
     />
   </div>
-</DModal>
-
+</DModal>
\ No newline at end of file

From 794b7c9d5c6ec5f36e3a597935c140b3fb68fb43 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 19:19:20 +0100
Subject: [PATCH 12/20] add missing I18n imports

---
 .../discourse/components/modal/admin-wizards-columns.js          | 1 +
 .../discourse/components/modal/next-session-scheduled.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.js b/assets/javascripts/discourse/components/modal/admin-wizards-columns.js
index 87c6673f..d4da771e 100644
--- a/assets/javascripts/discourse/components/modal/admin-wizards-columns.js
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.js
@@ -1,5 +1,6 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default class AdminWizardsColumnComponent extends Component {
   title = I18n.t("admin.wizard.edit_columns");
diff --git a/assets/javascripts/discourse/components/modal/next-session-scheduled.js b/assets/javascripts/discourse/components/modal/next-session-scheduled.js
index 890ecc73..446237f0 100644
--- a/assets/javascripts/discourse/components/modal/next-session-scheduled.js
+++ b/assets/javascripts/discourse/components/modal/next-session-scheduled.js
@@ -1,6 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
+import I18n from "I18n";
 
 export default class NextSessionScheduledComponent extends Component {
   @tracked bufferedDateTime;

From a786b5956beaca47b6b43e83467ec337a88bc7bd Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 19:21:10 +0100
Subject: [PATCH 13/20] linting

---
 .../discourse/components/modal/admin-wizards-columns.hbs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
index 1a8f7fbb..5e3829da 100644
--- a/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
+++ b/assets/javascripts/discourse/components/modal/admin-wizards-columns.hbs
@@ -3,7 +3,7 @@
     <LoadingSpinner size="large" />
   {{else}}
     <div class="edit-directory-columns-container">
-      {{#each this.args.model.columns as |column|}}
+      {{#each @model.columns as |column|}}
         <div class="edit-directory-column">
           <div class="left-content">
             <label class="column-name">

From 766d3b5fc96d9d3fb20c98ec878bcd5cd9e728e4 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 20:02:02 +0100
Subject: [PATCH 14/20] fix erroneous route transitions

---
 .../discourse/controllers/admin-wizards-api-show.js.es6      | 2 +-
 .../discourse/controllers/custom-wizard-step.js.es6          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
index f847422e..31b91e16 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js.es6
@@ -251,7 +251,7 @@ export default Controller.extend({
         .catch(popupAjaxError)
         .then((result) => {
           if (result.success) {
-            this.router.transitionToRoute("adminWizardsApis").then(() => {
+            this.router.transitionTo("adminWizardsApis").then(() => {
               this.send("refreshModel");
             });
           }
diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index f38747d1..1eda541c 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -17,12 +17,13 @@ export default Controller.extend({
         const wizardId = this.get("wizard.id");
         window.location.href = getUrl(`/w/${wizardId}/steps/${nextStepId}`);
       } else {
-        this.router.transitionToRoute("customWizardStep", nextStepId);
+        debugger;
+        this.router.transitionTo("customWizardStep", nextStepId);
       }
     },
 
     goBack() {
-      this.router.transitionToRoute(
+      this.router.transitionTo(
         "customWizardStep",
         this.get("step.previous")
       );

From 61ea75dcad0d794201eb6d21cd3b4c28b6de3298 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 20:03:02 +0100
Subject: [PATCH 15/20] remove debugger statement

---
 .../javascripts/discourse/controllers/custom-wizard-step.js.es6  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index 1eda541c..7672286d 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -17,7 +17,6 @@ export default Controller.extend({
         const wizardId = this.get("wizard.id");
         window.location.href = getUrl(`/w/${wizardId}/steps/${nextStepId}`);
       } else {
-        debugger;
         this.router.transitionTo("customWizardStep", nextStepId);
       }
     },

From 22fac139b6676af566d09102d1cd09e53882974a Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 20:08:10 +0100
Subject: [PATCH 16/20] linting

---
 .../discourse/controllers/custom-wizard-step.js.es6          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6 b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
index 7672286d..d1a299fd 100644
--- a/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/controllers/custom-wizard-step.js.es6
@@ -22,10 +22,7 @@ export default Controller.extend({
     },
 
     goBack() {
-      this.router.transitionTo(
-        "customWizardStep",
-        this.get("step.previous")
-      );
+      this.router.transitionTo("customWizardStep", this.get("step.previous"));
     },
 
     showMessage(message) {

From ffa37e895c1f758f5f4757545920f4607a99d3b6 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 20:35:30 +0100
Subject: [PATCH 17/20] fix test and test spelling

---
 .../acceptance/admin-custom-fields-unsubscribed-test.js       | 2 +-
 test/javascripts/acceptance/admin-wizards-unsuscribed-test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js b/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
index 8811c989..fbfa2314 100644
--- a/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
+++ b/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
@@ -13,7 +13,7 @@ import {
 } from "../helpers/admin-wizard";
 import { Promise } from "rsvp";
 
-acceptance("Admin | Custom Fields Unsuscribed", function (needs) {
+acceptance("Admin | Custom Fields Unsubscribed", function (needs) {
   needs.user();
   needs.settings({
     custom_wizard_enabled: true,
diff --git a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
index 9e2b00e7..36b73f7c 100644
--- a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
+++ b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
@@ -16,7 +16,7 @@ import {
   getWizard,
 } from "../helpers/admin-wizard";
 
-acceptance("Admin | Custom Wizard Unsuscribed", function (needs) {
+acceptance("Admin | Custom Wizard Unsubscribed", function (needs) {
   needs.user();
   needs.settings({
     custom_wizard_enabled: true,
@@ -257,7 +257,7 @@ acceptance("Admin | Custom Wizard Unsuscribed", function (needs) {
       ".wizard-custom-step .wizard-text-editor .d-editor button.local-dates"
     );
     assert.ok(
-      exists(".discourse-local-dates-create-modal.modal-body"),
+      exists(".discourse-local-dates-create-modal .modal-body"),
       "Insert date-time modal visible"
     );
     assert.ok(

From 713c1bcaa54378dfc39e3670bb1ba304d07558bf Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 20:47:05 +0100
Subject: [PATCH 18/20] fix test

---
 test/javascripts/acceptance/admin-wizards-unsuscribed-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
index 36b73f7c..52d70e69 100644
--- a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
+++ b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
@@ -269,7 +269,7 @@ acceptance("Admin | Custom Wizard Unsubscribed", function (needs) {
     await click(".modal-footer button.advanced-mode-btn");
     assert.ok(
       exists(
-        ".discourse-local-dates-create-modal.modal-body .advanced-options"
+        ".discourse-local-dates-create-modal .modal-body .advanced-options"
       ),
       "Advanced mode is visible"
     );

From c6fded7113023caab0ce7f75231a5edaf2c9870b Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Thu, 14 Sep 2023 21:08:20 +0100
Subject: [PATCH 19/20] fix disabled behaviour of start time button

---
 .../discourse/components/modal/next-session-scheduled.hbs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
index 62d291f2..2bb4a784 100644
--- a/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
+++ b/assets/javascripts/discourse/components/modal/next-session-scheduled.hbs
@@ -14,7 +14,7 @@
       @action={{action "submit"}}
       class="btn-primary"
       @label="admin.wizard.after_time_modal.done"
-      disabled={{this.submitDisabled}}
+      @disabled={{this.submitDisabled}}
     />
   </div>
 </DModal>
\ No newline at end of file

From 2460685e65e4db8b356a31f653a472a6248d9693 Mon Sep 17 00:00:00 2001
From: merefield <merefield@gmail.com>
Date: Fri, 15 Sep 2023 07:04:17 +0100
Subject: [PATCH 20/20] remove unintentional comment

---
 .../discourse/controllers/admin-wizards-wizard-show.js.es6      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
index 6fa38b0b..7ae48709 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-wizard-show.js.es6
@@ -135,8 +135,6 @@ export default Controller.extend({
             this.set("wizard.after_time_scheduled", dateTime),
         },
       });
-
-      // controller.setup();
     },
 
     copyUrl() {