From cff9d4726c1aa51f3113b3e1bf927134877ba04a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Mar 2020 10:00:48 +0100
Subject: [PATCH] FIX: ensures search-menu is not briefly showing previous
 results (#9272)

---
 .../discourse/widgets/search-menu.js          | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js b/app/assets/javascripts/discourse/widgets/search-menu.js
index 7bc56bfdbb4a5..cec34e75a9b90 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js
@@ -1,5 +1,5 @@
 import { get } from "@ember/object";
-import { debounce, cancel } from "@ember/runloop";
+import { debounce } from "@ember/runloop";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { searchForTerm, isValidSearchTerm } from "discourse/lib/search";
 import { createWidget } from "discourse/widgets/widget";
@@ -27,7 +27,7 @@ const SearchHelper = {
   // for cancelling debounced search
   cancel() {
     if (this._activeSearch) {
-      cancel(this._activeSearch);
+      this._activeSearch.abort();
       this._activeSearch = null;
     }
   },
@@ -55,21 +55,24 @@ const SearchHelper = {
       });
       this._activeSearch
         .then(content => {
-          searchData.noResults = content.resultTypes.length === 0;
-          searchData.results = content;
-
-          if (searchContext && searchContext.type === "topic") {
-            widget.appEvents.trigger("post-stream:refresh", { force: true });
-            searchData.topicId = searchContext.id;
-          } else {
-            searchData.topicId = null;
+          // we ensure the current search term is the one used
+          // when starting the query
+          if (term === searchData.term) {
+            searchData.noResults = content.resultTypes.length === 0;
+            searchData.results = content;
+
+            if (searchContext && searchContext.type === "topic") {
+              widget.appEvents.trigger("post-stream:refresh", { force: true });
+              searchData.topicId = searchContext.id;
+            } else {
+              searchData.topicId = null;
+            }
           }
         })
         .catch(popupAjaxError)
         .finally(() => {
           searchData.loading = false;
           widget.scheduleRerender();
-          this._activeSearch = null;
         });
     }
   }