DEV: Changing search mode re-triggers search

discourse · May 15, 2024 · 2ef2273 · 2ef2273
1 parent c62d2e7
commit 2ef2273
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/assets/javascripts/discourse/components/search-container.gjs b/assets/javascripts/discourse/components/search-container.gjs
@@ -137,6 +137,7 @@ export default class SearchContainer extends Component {
           @uiState={{this.uiState}}
           @searchModes={{@searchModes}}
           @searchMode={{@searchMode}}
+          @updateSearchMode={{@updateSearchMode}}
         >
           <:sortBy>
             {{yield to="sortBy"}}

diff --git a/assets/javascripts/discourse/components/search-header.gjs b/assets/javascripts/discourse/components/search-header.gjs
@@ -1,13 +1,13 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
+import { service } from "@ember/service";
 import { modifier } from "ember-modifier";
 import DButton from "discourse/components/d-button";
 import i18n from "discourse-common/helpers/i18n";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import I18n from "discourse-i18n";
 import ComboBox from "select-kit/components/combo-box";
-import { service } from "@ember/service";
 
 export default class SearchHeader extends Component {
   @service dInstantSearch;
@@ -132,6 +132,15 @@ export default class SearchHeader extends Component {
     this.showAdvancedFilters = !this.showAdvancedFilters;
   }
 
+  @action
+  changeSearchMode(newSearchMode) {
+    this.args.updateSearchMode(newSearchMode);
+
+    if (this.args.query?.length > 0) {
+      this.dInstantSearch.helper.search();
+    }
+  }
+
   <template>
     <div class="search-header" role="search">
       <h1 class="search-page-heading">
@@ -140,6 +149,7 @@ export default class SearchHeader extends Component {
           @valueProperty="value"
           @content={{@searchModes}}
           @value={{@searchMode}}
+          @onChange={{this.changeSearchMode}}
         />
 
         {{#if @query}}

diff --git a/assets/javascripts/discourse/controllers/instant-search.js b/assets/javascripts/discourse/controllers/instant-search.js
@@ -129,4 +129,9 @@ export default class InstantSearch extends Controller {
   async updateQuery(newQuery) {
     this.query = newQuery;
   }
+
+  @action
+  updateSearchMode(newSearchMode) {
+    this.searchMode = newSearchMode;
+  }
 }
diff --git a/assets/javascripts/discourse/templates/instant-search.hbs b/assets/javascripts/discourse/templates/instant-search.hbs
@@ -8,6 +8,7 @@
     @query={{this.query}}
     @searchMode={{this.searchMode}}
     @searchModes={{this.searchModes}}
+    @updateSearchMode={{this.updateSearchMode}}
   >
     <:sortBy>
       <ComboBox
@@ -28,6 +29,7 @@
     @query={{this.query}}
     @searchMode={{this.searchMode}}
     @searchModes={{this.searchModes}}
+    @updateSearchMode={{this.updateSearchMode}}
   >
     <:sortBy>
       <ComboBox
@@ -48,6 +50,7 @@
     @query={{this.query}}
     @searchMode={{this.searchMode}}
     @searchModes={{this.searchModes}}
+    @updateSearchMode={{this.updateSearchMode}}
   >
     <:sortBy>
       <ComboBox
@@ -68,6 +71,7 @@
     @query={{this.query}}
     @searchMode={{this.searchMode}}
     @searchModes={{this.searchModes}}
+    @updateSearchMode={{this.updateSearchMode}}
   >
     <:sortBy>
       <ComboBox