COMPATIBILITY: Update composer integration to prevent exceptions

assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6

@@ -2,8 +2,8 @@ import {
   default as computed,
   observes,
 } from "discourse-common/utils/decorators";
-import EmberObject from "@ember/object";
 import Component from "@ember/component";
+import EmberObject, { action } from "@ember/object";
 
 export default Component.extend({
   showPreview: false,
@@ -34,15 +34,23 @@ export default Component.extend({
       : "wizard_composer.show_preview";
   },
 
-  actions: {
+  @action
-    togglePreview() {
+  importQuote() {},
-      this.toggleProperty("showPreview");
-    },
 
-    groupsMentioned() {},
+  @action
-    afterRefresh() {},
+  groupsMentioned() {},
-    cannotSeeMention() {},
+
-    importQuote() {},
+  @action
-    showUploadSelector() {},
+  afterRefresh() {},
+
+  @action
+  cannotSeeMention() {},
+
+  @action
+  showUploadSelector() {},
+
+  @action
+  togglePreview() {
+    this.toggleProperty("showPreview");
   },
 });

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

@@ -1,21 +1,21 @@
-{{d-editor
+<DEditor
-  tabindex=field.tabindex
+  @tabindex={{field.tabindex}}
-  value=composer.reply
+  @value={{composer.reply}}
-  placeholderOverride=replyPlaceholder
+  @placeholderOverride={{replyPlaceholder}}
-  previewUpdated=(action "previewUpdated")
+  @previewUpdated={{this.previewUpdated}}
-  markdownOptions=markdownOptions
+  @markdownOptions={{markdownOptions}}
-  extraButtons=(action "extraButtons")
+  @extraButtons={{this.extraButtons}}
-  importQuote=(action "importQuote")
+  @importQuote={{this.importQuote}}
-  showUploadModal=(action "showUploadModal")
+  @showUploadModal={{this.showUploadModal}}
-  togglePreview=(action "togglePreview")
+  @togglePreview={{this.togglePreview}}
-  validation=validation
+  @validation={{validation}}
-  loading=composer.loading
+  @loading={{composer.loading}}
-  showLink=showLink
+  @showLink={{showLink}}
-  wizardComposer=true
+  @wizardComposer={{true}}
-  fieldId=field.id
+  @fieldId={{field.id}}
-  disabled=disableTextarea
+  @disabled={{disableTextarea}}
-  outletArgs=(hash composer=composer editorType="composer")
+  @outletArgs={{hash composer=composer editorType="composer"}}
-}}
+/>
 
 <input
   type="file"

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

@@ -1,14 +1,14 @@
-{{custom-wizard-composer-editor
+<CustomWizardComposerEditor
-  field=field
+  @field={{field}}
-  composer=composer
+  @composer={{composer}}
-  wizard=wizard
+  @wizard={{wizard}}
-  fieldClass=fieldClass
+  @fieldClass={{fieldClass}}
-  groupsMentioned=(action "groupsMentioned")
+  @groupsMentioned={{this.groupsMentioned}}
-  cannotSeeMention=(action "cannotSeeMention")
+  @cannotSeeMention={{this.cannotSeeMention}}
-  importQuote=(action "importQuote")
+  @importQuote={{this.importQuote}}
-  togglePreview=(action "togglePreview")
+  @togglePreview={{this.togglePreview}}
-  afterRefresh=(action "afterRefresh")
+  @afterRefresh={{this.afterRefresh}}
-}}
+/>
 
 <div class="bottom-bar">
   <button

assets/stylesheets/common/wizard/composer.scss

@@ -103,6 +103,10 @@ body.custom-wizard {
     .btn.italic {
       font-style: italic;
     }
+
+    .toolbar-popup-menu-options {
+      display: none;
+    }
   }
 
   .d-editor-spacer {

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.8.5
+# version: 2.8.6
 # 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