Fix up stuffs

Author: markvanlan

assets/javascripts/discourse/connectors/full-page-search-below-search-header/semantic-search.gjs

@@ -32,7 +32,7 @@ export default class SemanticSearch extends Component {
   constructor() {
     super(...arguments);
     this.appEvents.on("full-page-search:trigger-search", this, this.onSearch);
-    this.handleSearch();
+    this.onSearch();
   }
 
   willDestroy() {
@@ -42,10 +42,14 @@ export default class SemanticSearch extends Component {
 
   @action
   onSearch() {
-    if (!this.searching) {
-      this.resetAiResults();
-      return this.performHyDESearch();
+    if (!this.searchEnabled) {
+      return;
     }
+
+    this.initialSearchTerm = this.args.outletArgs.search;
+    this.searching = true;
+    this.resetAiResults();
+    return this.performHyDESearch();
   }
 
   get disableToggleSwitch() {
@@ -69,30 +73,28 @@ export default class SemanticSearch extends Component {
       );
     }
 
-    // Search results:
-    if (this.AiResults.length > 0) {
-      if (this.showingAiResults) {
-        return I18n.t(
-          "discourse_ai.embeddings.semantic_search_results.toggle",
-          {
-            count: this.AiResults.length,
-          }
-        );
-      } else {
-        return I18n.t(
-          "discourse_ai.embeddings.semantic_search_results.toggle_hidden",
-          {
-            count: this.AiResults.length,
-          }
-        );
-      }
-    }
-
     // Search loading:
     if (this.searching) {
       return I18n.t("discourse_ai.embeddings.semantic_search_loading");
     }
 
+    // We have results and we are showing them
+    if (this.AiResults.length && this.showingAiResults) {
+      return I18n.t("discourse_ai.embeddings.semantic_search_results.toggle", {
+        count: this.AiResults.length,
+      });
+    }
+
+    // We have results but are hiding them
+    if (this.AiResults.length && !this.showingAiResults) {
+      return I18n.t(
+        "discourse_ai.embeddings.semantic_search_results.toggle_hidden",
+        {
+          count: this.AiResults.length,
+        }
+      );
+    }
+
     // Typing to search:
     if (
       this.AiResults.length === 0 &&
@@ -140,18 +142,6 @@ export default class SemanticSearch extends Component {
     this.args.outletArgs.addSearchResults([], "topic_id");
   }
 
-  @action
-  handleSearch() {
-    if (!this.searchEnabled) {
-      return;
-    }
-
-    if (this.initialSearchTerm) {
-      this.searching = true;
-      return this.performHyDESearch();
-    }
-  }
-
   performHyDESearch() {
     this.resetAiResults();
 
@@ -182,7 +172,7 @@ export default class SemanticSearch extends Component {
       this.sortOrder = this.args.outletArgs.sortOrder;
 
       if (this.validSearchOrder) {
-        this.handleSearch();
+        this.onSearch();
       } else {
         this.showingAiResults = false;
         this.resetAiResults();
@@ -195,7 +185,9 @@ export default class SemanticSearch extends Component {
     <div class="semantic-search__container search-results" role="region">
       <div class="semantic-search__results">
         <div
-          class="semantic-search__searching {{if this.searching 'in-progress'}}"
+          class="semantic-search__searching
+            {{if this.searching 'in-progress'}}
+            {{unless this.validSearchOrder 'unavailable'}}"
         >
           <DToggleSwitch
             disabled={{this.disableToggleSwitch}}
@@ -209,14 +201,15 @@ export default class SemanticSearch extends Component {
             {{this.searchStateText}}
           </div>
 
-          <AiIndicatorWave @loading={{this.searching}} />
+          {{#if this.validSearchOrder}}
+            <AiIndicatorWave @loading={{this.searching}} />
+          {{/if}}
 
           {{#unless this.validSearchOrder}}
 
             <DTooltip
               @identifier="semantic-search-unavailable-tooltip"
               class="semantic-search__unavailable-tooltip"
-              ...attributes
             >
               <:trigger>
                 {{icon "far-circle-question"}}

assets/stylesheets/modules/embeddings/common/semantic-search.scss

@@ -16,7 +16,8 @@
         display: flex;
         align-items: center;
 
-        &.in-progress {
+        &.in-progress,
+        &.unavailable {
           .semantic-search__searching-text {
             color: var(--primary-medium);
           }

config/locales/client.en.yml

@@ -484,7 +484,7 @@ en:
           none: "Sorry, our AI search found no matching topics"
           new: "Press 'search' to begin looking for new results with AI"
           unavailable: "AI results unavailable"
-        semantic_search_unavailable_tooltip: "Search results must be sorted by Relevance to display AI results."
+        semantic_search_unavailable_tooltip: "Search results must be sorted by Relevance to display AI results"
         ai_generated_result: "Search result found using AI"
         quick_search:
           suffix: "in all topics and posts with AI"

lib/embeddings/entry_point.rb

@@ -4,6 +4,9 @@ module DiscourseAi
   module Embeddings
     class EntryPoint
       def inject_into(plugin)
+        # far-circle-question used by semantic search unavailable tooltip
+        register_svg_icon "far-circle-question" if respond_to?(:register_svg_icon)
+
         # Include random topics in the suggested list *only* if there are no related topics.
         plugin.register_modifier(
           :topic_view_suggested_topics_options,

plugin.rb

@@ -43,8 +43,6 @@
 
 register_asset "stylesheets/modules/ai-bot/common/ai-artifact.scss"
 
-register_svg_icon "far-circle-question" if respond_to?(:register_svg_icon)
-
 module ::DiscourseAi
   PLUGIN_NAME = "discourse-ai"