Discource-C
/
discourse-ai
mirror of https://github.com/discourse/discourse-ai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Only allow semantic search on "Relevance" sort mode (#306)

This commit is contained in:
Keegan George 2023-11-23 11:30:17 -08:00 committed by GitHub
parent 02efca162e
commit df8804afcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ import { tracked } from "@glimmer/tracking";
import { on } from "@ember/modifier"; import { on } from "@ember/modifier";
import { action } from "@ember/object"; import { action } from "@ember/object";
import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import didUpdate from "@ember/render-modifiers/modifiers/did-update";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import DToggleSwitch from "discourse/components/d-toggle-switch"; import DToggleSwitch from "discourse/components/d-toggle-switch";
import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search"; import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search";
@ -20,19 +21,24 @@ export default class SemanticSearch extends Component {
@service appEvents; @service appEvents;
@service siteSettings; @service siteSettings;
@service searchPreferencesManager;
@tracked searching = false; @tracked searching = false;
@tracked AIResults = []; @tracked AIResults = [];
@tracked showingAIResults = false; @tracked showingAIResults = false;
@tracked preventAISearch = false;
initialSearchTerm = this.args.outletArgs.search; initialSearchTerm = this.args.outletArgs.search;
get disableToggleSwitch() { get disableToggleSwitch() {
if (this.searching || this.AIResults.length === 0) { if (this.searching || this.AIResults.length === 0 || this.preventAISearch) {
return true; return true;
} }
} }
get searchStateText() { get searchStateText() {
if (this.preventAISearch) {
return I18n.t("discourse_ai.embeddings.semantic_search_disabled_sort");
}
if (this.searching) { if (this.searching) {
return I18n.t("discourse_ai.embeddings.semantic_search_loading"); return I18n.t("discourse_ai.embeddings.semantic_search_loading");
} }
@ -98,6 +104,13 @@ export default class SemanticSearch extends Component {
return; return;
} }
if (this.searchPreferencesManager.sortOrder !== 0) {
this.preventAISearch = true;
return;
} else {
this.preventAISearch = false;
}
if (this.initialSearchTerm) { if (this.initialSearchTerm) {
return this.performHyDESearch(); return this.performHyDESearch();
} }
@ -137,7 +150,7 @@ export default class SemanticSearch extends Component {
<template> <template>
{{#if this.searchEnabled}} {{#if this.searchEnabled}}
<div class="semantic-search__container search-results" role="region"> <div class="semantic-search__container search-results" role="region">
<div class="semantic-search__results" {{didInsert this.handleSearch}}> <div class="semantic-search__results" {{didInsert this.handleSearch}} {{didUpdate this.handleSearch this.searchTerm}}>
<div <div
class="semantic-search__searching class="semantic-search__searching
{{if this.searching 'in-progress'}}" {{if this.searching 'in-progress'}}"

1
config/locales/client.en.yml
View File

@ -108,6 +108,7 @@ en:
embeddings: embeddings:
semantic_search: "Topics (Semantic)" semantic_search: "Topics (Semantic)"
semantic_search_loading: "Searching for more results using AI" semantic_search_loading: "Searching for more results using AI"
semantic_search_disabled_sort: "AI Search disabled for this sort order, sort by Relevance to enable."
semantic_search_results: semantic_search_results:
toggle: "Showing %{count} results found using AI" toggle: "Showing %{count} results found using AI"
toggle_hidden: "Hiding %{count} results found using AI" toggle_hidden: "Hiding %{count} results found using AI"