Merge branch 'main' into add_discourse_plugin_statistics

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

@@ -4,7 +4,7 @@ import {
   default as discourseComputed,
   observes,
 } from "discourse-common/utils/decorators";
-import { getOwner } from "discourse-common/lib/get-owner";
+import { getOwner } from "@ember/application";
 import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
 import {
   generateName,

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

@@ -85,6 +85,8 @@ export default {
       });
 
       api.modifyClass("component:category-chooser", {
+        pluginId: "custom-wizard",
+
         categoriesByScope(options = {}) {
           let categories = this._super(options);
           const currentUser = this.currentUser;

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

@@ -1,5 +1,5 @@
 import { get, set } from "@ember/object";
-import { getOwner } from "discourse-common/lib/get-owner";
+import { getOwnerWithFallback } from "discourse-common/lib/get-owner";
 
 const wizard = {
   basic: {
@@ -279,7 +279,7 @@ export function filterValues(currentWizard, feature, attribute, values = null) {
   return values;
 }
 
-const siteSettings = getOwner(this).lookup("service:site-settings");
+const siteSettings = getOwnerWithFallback(this).lookup("service:site-settings");
 if (siteSettings.wizard_apis_enabled) {
   wizardSchema.action.types.send_to_api = {
     api: null,

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

@@ -1,5 +1,5 @@
 import Mixin from "@ember/object/mixin";
-import { getOwner } from "discourse-common/lib/get-owner";
+import { getOwner } from "@ember/application";
 import { readOnly } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 

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

@@ -7,7 +7,7 @@
       <li>
         <span class="setting-title">
           <h4>{{i18n (concat "admin.wizard.field.validations." type)}}</h4>
-          <Input @type="checkbox" @checked={{this.props.status}} />
+          <Input @type="checkbox" @checked={{props.status}} />
           {{i18n "admin.wizard.field.validations.enabled"}}
         </span>
         <div class="validation-container">
@@ -36,7 +36,7 @@
             <div class="setting-value">
               <Input
                 @type="number"
-                @value={{this.props.time_n_value}}
+                @value={{props.time_n_value}}
                 class="time-n-value"
               />
               {{combo-box