From c1db1442b7429b81fc2004f55d7f97ed9dbb4c7d Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Wed, 9 Oct 2024 10:01:28 +0200
Subject: [PATCH] COMPATIBILITY: Update composer integration to prevent
 exceptions

---
 .../custom-wizard-field-composer.js.es6       | 28 +++++++++------
 .../custom-wizard-composer-editor.hbs         | 36 +++++++++----------
 .../custom-wizard-field-composer.hbs          | 22 ++++++------
 .../stylesheets/common/wizard/composer.scss   |  4 +++
 plugin.rb                                     |  2 +-
 5 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6 b/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6
index 1a25344c..6a615463 100644
--- a/assets/javascripts/discourse/components/custom-wizard-field-composer.js.es6
+++ b/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: {
-    togglePreview() {
-      this.toggleProperty("showPreview");
-    },
+  @action
+  importQuote() {},
 
-    groupsMentioned() {},
-    afterRefresh() {},
-    cannotSeeMention() {},
-    importQuote() {},
-    showUploadSelector() {},
+  @action
+  groupsMentioned() {},
+
+  @action
+  afterRefresh() {},
+
+  @action
+  cannotSeeMention() {},
+
+  @action
+  showUploadSelector() {},
+
+  @action
+  togglePreview() {
+    this.toggleProperty("showPreview");
   },
 });
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs
index 70286603..4dce0119 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs
+++ b/assets/javascripts/discourse/templates/components/custom-wizard-composer-editor.hbs
@@ -1,21 +1,21 @@
-{{d-editor
-  tabindex=field.tabindex
-  value=composer.reply
-  placeholderOverride=replyPlaceholder
-  previewUpdated=(action "previewUpdated")
-  markdownOptions=markdownOptions
-  extraButtons=(action "extraButtons")
-  importQuote=(action "importQuote")
-  showUploadModal=(action "showUploadModal")
-  togglePreview=(action "togglePreview")
-  validation=validation
-  loading=composer.loading
-  showLink=showLink
-  wizardComposer=true
-  fieldId=field.id
-  disabled=disableTextarea
-  outletArgs=(hash composer=composer editorType="composer")
-}}
+<DEditor
+  @tabindex={{field.tabindex}}
+  @value={{composer.reply}}
+  @placeholderOverride={{replyPlaceholder}}
+  @previewUpdated={{this.previewUpdated}}
+  @markdownOptions={{markdownOptions}}
+  @extraButtons={{this.extraButtons}}
+  @importQuote={{this.importQuote}}
+  @showUploadModal={{this.showUploadModal}}
+  @togglePreview={{this.togglePreview}}
+  @validation={{validation}}
+  @loading={{composer.loading}}
+  @showLink={{showLink}}
+  @wizardComposer={{true}}
+  @fieldId={{field.id}}
+  @disabled={{disableTextarea}}
+  @outletArgs={{hash composer=composer editorType="composer"}}
+/>
 
 <input
   type="file"
diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs
index ecc8058b..2cb4e66c 100644
--- a/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs
+++ b/assets/javascripts/discourse/templates/components/custom-wizard-field-composer.hbs
@@ -1,14 +1,14 @@
-{{custom-wizard-composer-editor
-  field=field
-  composer=composer
-  wizard=wizard
-  fieldClass=fieldClass
-  groupsMentioned=(action "groupsMentioned")
-  cannotSeeMention=(action "cannotSeeMention")
-  importQuote=(action "importQuote")
-  togglePreview=(action "togglePreview")
-  afterRefresh=(action "afterRefresh")
-}}
+<CustomWizardComposerEditor
+  @field={{field}}
+  @composer={{composer}}
+  @wizard={{wizard}}
+  @fieldClass={{fieldClass}}
+  @groupsMentioned={{this.groupsMentioned}}
+  @cannotSeeMention={{this.cannotSeeMention}}
+  @importQuote={{this.importQuote}}
+  @togglePreview={{this.togglePreview}}
+  @afterRefresh={{this.afterRefresh}}
+/>
 
 <div class="bottom-bar">
   <button
diff --git a/assets/stylesheets/common/wizard/composer.scss b/assets/stylesheets/common/wizard/composer.scss
index aee47333..ebaa727c 100644
--- a/assets/stylesheets/common/wizard/composer.scss
+++ b/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 {
diff --git a/plugin.rb b/plugin.rb
index 67f0fb07..31414a9f 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.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