From db54b80275ed844ec335b321994275a6a0d5f310 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 25 May 2023 13:17:55 +0100
Subject: [PATCH] DEV: Replace `HideModalTrigger` with JS logic (#21746)

No need to set up a whole component here - we can just call the necessary JS directly from the `closeModal` function.

(extracted from https://github.com/discourse/discourse/pull/21304)
---
 .../discourse/app/components/hide-modal-trigger.js         | 7 -------
 app/assets/javascripts/discourse/app/routes/application.js | 1 +
 .../javascripts/discourse/app/templates/hide-modal.hbs     | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/app/components/hide-modal-trigger.js

diff --git a/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js b/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
deleted file mode 100644
index 9bafc1b39c6..00000000000
--- a/app/assets/javascripts/discourse/app/components/hide-modal-trigger.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Component from "@ember/component";
-export default Component.extend({
-  didInsertElement() {
-    this._super(...arguments);
-    $(".d-modal.fixed-modal").modal("hide");
-  },
-});
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 4328e0bbc1b..8495d9648a6 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -168,6 +168,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
       }
 
       this.render("hide-modal", { into: "modal", outlet: "modalBody" });
+      $(".d-modal.fixed-modal").modal("hide");
 
       if (controllerName) {
         const controller = getOwner(this).lookup(
diff --git a/app/assets/javascripts/discourse/app/templates/hide-modal.hbs b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
index bb85151265c..e69de29bb2d 100644
--- a/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/hide-modal.hbs
@@ -1 +0,0 @@
-<HideModalTrigger />
\ No newline at end of file