From a6fa16816ca05e53a90c01e40fdb1ecbcc5060b4 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Sat, 3 Dec 2022 19:06:12 +0100
Subject: [PATCH] DEV: Clean up new-user-narrative js

---
 .../initializers/new-user-narrative.js        | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
index ef3241193a..981c472d81 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
@@ -1,19 +1,17 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 
-const PLUGIN_ID = "new-user-narrative";
-
 function initialize(api) {
-  const messageBus = api.container.lookup("service:message-bus");
   const currentUser = api.getCurrentUser();
-  const appEvents = api.container.lookup("service:app-events");
 
-  api.modifyClass("component:site-header", {
-    pluginId: PLUGIN_ID,
-    didInsertElement() {
-      this._super(...arguments);
-      this.dispatch("header:search-context-trigger", "header");
-    },
-  });
+  if (!currentUser) {
+    return;
+  }
+
+  api.dispatchWidgetAppEvent(
+    "site-header",
+    "header",
+    "header:search-context-trigger"
+  );
 
   api.attachWidgetAction("header", "headerSearchContextTrigger", function () {
     if (this.site.mobileView) {
@@ -24,11 +22,12 @@ function initialize(api) {
     }
   });
 
-  if (messageBus && currentUser) {
-    messageBus.subscribe(`/new_user_narrative/tutorial_search`, () => {
-      appEvents.trigger("header:search-context-trigger");
-    });
-  }
+  const messageBus = api.container.lookup("service:message-bus");
+  const appEvents = api.container.lookup("service:app-events");
+
+  messageBus.subscribe(`/new_user_narrative/tutorial_search`, () => {
+    appEvents.trigger("header:search-context-trigger");
+  });
 }
 
 export default {