From 11ff364cbe3ab15c34eccc5e7b5485a67fa9816e Mon Sep 17 00:00:00 2001
From: romanrizzi <rizziromanalejandro@gmail.com>
Date: Tue, 22 Dec 2020 10:01:29 -0300
Subject: [PATCH 1/2]  Use the new discourseDebounce function wrapper.

We recently merged a Discourse core's PR to replace usages of Ember's debounce and discourseDebounce with a new debounce wrapper. The new wrapper works exactly like Ember's debounce but internally calls "run" when called in test mode.

This PR replaces all usages of other debounce functions with the new wrapper and fallbacks to Ember's debounce for backward-compatibility.
---
 assets/javascripts/wizard-custom.js           |  2 +-
 .../javascripts/wizard/lib/user-search.js.es6 | 38 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js
index c9a8c915..4c6561c6 100644
--- a/assets/javascripts/wizard-custom.js
+++ b/assets/javascripts/wizard-custom.js
@@ -14,7 +14,6 @@
 //= require discourse/app/lib/notification-levels
 //= require discourse/app/lib/computed
 //= require discourse/app/lib/user-search
-//= require discourse/app/lib/debounce
 //= require discourse/app/lib/text
 //= require discourse/app/lib/formatter
 //= require discourse/app/lib/quote
@@ -85,6 +84,7 @@
 //= require discourse-common/addon/helpers/component-for-collection
 //= require discourse-common/addon/helpers/component-for-row
 //= require discourse-common/addon/lib/raw-templates
+//= require discourse-common/lib/debounce
 //= require discourse/app/helpers/discourse-tag
 
 //= require discourse/app/services/app-events
diff --git a/assets/javascripts/wizard/lib/user-search.js.es6 b/assets/javascripts/wizard/lib/user-search.js.es6
index 617825d1..55b6b069 100644
--- a/assets/javascripts/wizard/lib/user-search.js.es6
+++ b/assets/javascripts/wizard/lib/user-search.js.es6
@@ -1,6 +1,7 @@
 import { CANCELLED_STATUS } from 'discourse/lib/autocomplete';
+import { debounce } from "@ember/runloop";
+import discourseDebounce from "discourse-common/lib/debounce";
 import getUrl from 'discourse-common/lib/get-url';
-import discourseDebounce from "discourse/lib/debounce";
 
 var cache = {},
     cacheTopicId,
@@ -40,8 +41,6 @@ function performSearch(term, topicId, includeGroups, includeMentionableGroups, i
   });
 }
 
-var debouncedSearch = discourseDebounce(performSearch, 300);
-
 function organizeResults(r, options) {
   if (r === CANCELLED_STATUS) { return r; }
 
@@ -119,17 +118,26 @@ export default function userSearch(options) {
       resolve(CANCELLED_STATUS);
     }, 5000);
 
-    debouncedSearch(term,
-        topicId,
-        includeGroups,
-        includeMentionableGroups,
-        includeMessageableGroups,
-        allowedUsers,
-        group,
-        function(r) {
-          clearTimeout(clearPromise);
-          resolve(organizeResults(r, options));
-        });
+    // TODO: Use discouseDebounce after the 2.7 release.
+    let debounceFunc = discourseDebounce || debounce;
 
-  });
+    debounceFunc(
+      this,
+      function() {
+        performSearch(
+          term,
+          topicId,
+          includeGroups,
+          includeMentionableGroups,
+          includeMessageableGroups,
+          allowedUsers,
+          group,
+          function(r) {
+            clearTimeout(clearPromise);
+            resolve(organizeResults(r, options));
+          }
+        )
+      },
+      300
+    )
 }

From 78dad97dc86c9bc3db8479dde4ab830c0784b167 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Mon, 4 Jan 2021 14:22:43 +0800
Subject: [PATCH 2/2] Use ember debounce until discourseDebounce hits stable

---
 assets/javascripts/wizard-custom.js              | 1 -
 assets/javascripts/wizard/lib/user-search.js.es6 | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js
index 4c6561c6..5d18328f 100644
--- a/assets/javascripts/wizard-custom.js
+++ b/assets/javascripts/wizard-custom.js
@@ -84,7 +84,6 @@
 //= require discourse-common/addon/helpers/component-for-collection
 //= require discourse-common/addon/helpers/component-for-row
 //= require discourse-common/addon/lib/raw-templates
-//= require discourse-common/lib/debounce
 //= require discourse/app/helpers/discourse-tag
 
 //= require discourse/app/services/app-events
diff --git a/assets/javascripts/wizard/lib/user-search.js.es6 b/assets/javascripts/wizard/lib/user-search.js.es6
index 55b6b069..5a86d8d8 100644
--- a/assets/javascripts/wizard/lib/user-search.js.es6
+++ b/assets/javascripts/wizard/lib/user-search.js.es6
@@ -1,6 +1,5 @@
 import { CANCELLED_STATUS } from 'discourse/lib/autocomplete';
 import { debounce } from "@ember/runloop";
-import discourseDebounce from "discourse-common/lib/debounce";
 import getUrl from 'discourse-common/lib/get-url';
 
 var cache = {},
@@ -118,10 +117,8 @@ export default function userSearch(options) {
       resolve(CANCELLED_STATUS);
     }, 5000);
 
-    // TODO: Use discouseDebounce after the 2.7 release.
-    let debounceFunc = discourseDebounce || debounce;
-
-    debounceFunc(
+    // TODO: Use discouseDebounce after it is available on stable.
+    debounce(
       this,
       function() {
         performSearch(
@@ -140,4 +137,5 @@ export default function userSearch(options) {
       },
       300
     )
+  });
 }