DEV: Run AI search before submit if query params present (#303)
This commit is contained in:
parent
c55014839f
commit
432590f8d9
|
@ -1,59 +1,19 @@
|
||||||
import Component from "@glimmer/component";
|
import Component from "@glimmer/component";
|
||||||
import { action } from "@ember/object";
|
|
||||||
import I18n from "I18n";
|
|
||||||
import { tracked } from "@glimmer/tracking";
|
import { tracked } from "@glimmer/tracking";
|
||||||
import { ajax } from "discourse/lib/ajax";
|
|
||||||
import { isValidSearchTerm, translateResults } from "discourse/lib/search";
|
|
||||||
import discourseDebounce from "discourse-common/lib/debounce";
|
|
||||||
import { inject as service } from "@ember/service";
|
|
||||||
import { bind } from "discourse-common/utils/decorators";
|
|
||||||
import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search";
|
|
||||||
import DToggleSwitch from "discourse/components/d-toggle-switch";
|
|
||||||
import { on } from "@ember/modifier";
|
import { on } from "@ember/modifier";
|
||||||
|
import { action } from "@ember/object";
|
||||||
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
|
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
|
||||||
import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
|
import { inject as service } from "@ember/service";
|
||||||
import icon from "discourse-common/helpers/d-icon";
|
import DToggleSwitch from "discourse/components/d-toggle-switch";
|
||||||
|
import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search";
|
||||||
|
import { ajax } from "discourse/lib/ajax";
|
||||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||||
import { withPluginApi } from "discourse/lib/plugin-api";
|
import { withPluginApi } from "discourse/lib/plugin-api";
|
||||||
|
import { isValidSearchTerm, translateResults } from "discourse/lib/search";
|
||||||
|
import icon from "discourse-common/helpers/d-icon";
|
||||||
|
import I18n from "I18n";
|
||||||
|
|
||||||
export default class SemanticSearch extends Component {
|
export default class SemanticSearch extends Component {
|
||||||
<template>
|
|
||||||
{{#if this.searchEnabled}}
|
|
||||||
<div class="semantic-search__container search-results" role="region">
|
|
||||||
<div
|
|
||||||
class="semantic-search__results"
|
|
||||||
{{didInsert this.performHyDESearch}}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="semantic-search__searching
|
|
||||||
{{if this.searching 'in-progress'}}"
|
|
||||||
>
|
|
||||||
<DToggleSwitch
|
|
||||||
disabled={{this.disableToggleSwitch}}
|
|
||||||
@state={{this.showingAIResults}}
|
|
||||||
title="AI search results hidden"
|
|
||||||
class="semantic-search__results-toggle"
|
|
||||||
{{on "click" this.toggleAIResults}}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="semantic-search__searching-text">
|
|
||||||
{{icon "discourse-sparkles"}}
|
|
||||||
{{this.searchStateText}}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{#if this.searching}}
|
|
||||||
<span class="semantic-search__indicator-wave">
|
|
||||||
<span class="semantic-search__indicator-dot">.</span>
|
|
||||||
<span class="semantic-search__indicator-dot">.</span>
|
|
||||||
<span class="semantic-search__indicator-dot">.</span>
|
|
||||||
</span>
|
|
||||||
{{/if}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
</template>
|
|
||||||
|
|
||||||
static shouldRender(_args, { siteSettings }) {
|
static shouldRender(_args, { siteSettings }) {
|
||||||
return siteSettings.ai_embeddings_semantic_search_enabled;
|
return siteSettings.ai_embeddings_semantic_search_enabled;
|
||||||
}
|
}
|
||||||
|
@ -64,6 +24,7 @@ export default class SemanticSearch extends Component {
|
||||||
@tracked searching = false;
|
@tracked searching = false;
|
||||||
@tracked AIResults = [];
|
@tracked AIResults = [];
|
||||||
@tracked showingAIResults = false;
|
@tracked showingAIResults = false;
|
||||||
|
initialSearchTerm = this.args.outletArgs.search;
|
||||||
|
|
||||||
get disableToggleSwitch() {
|
get disableToggleSwitch() {
|
||||||
if (this.searching || this.AIResults.length === 0) {
|
if (this.searching || this.AIResults.length === 0) {
|
||||||
|
@ -100,6 +61,11 @@ export default class SemanticSearch extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
get searchTerm() {
|
get searchTerm() {
|
||||||
|
if (this.initialSearchTerm !== this.args.outletArgs.search) {
|
||||||
|
this.initialSearchTerm = undefined;
|
||||||
|
this.resetAIResults();
|
||||||
|
}
|
||||||
|
|
||||||
return this.args.outletArgs.search;
|
return this.args.outletArgs.search;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,13 +93,23 @@ export default class SemanticSearch extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
@action
|
@action
|
||||||
performHyDESearch() {
|
handleSearch() {
|
||||||
if (!this.searchEnabled) {
|
if (!this.searchEnabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.initialSearchTerm) {
|
||||||
|
return this.performHyDESearch();
|
||||||
|
}
|
||||||
|
|
||||||
withPluginApi("1.15.0", (api) => {
|
withPluginApi("1.15.0", (api) => {
|
||||||
api.onAppEvent("full-page-search:trigger-search", () => {
|
api.onAppEvent("full-page-search:trigger-search", () => {
|
||||||
|
return this.performHyDESearch();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
performHyDESearch() {
|
||||||
this.searching = true;
|
this.searching = true;
|
||||||
this.resetAIResults();
|
this.resetAIResults();
|
||||||
|
|
||||||
|
@ -156,7 +132,39 @@ export default class SemanticSearch extends Component {
|
||||||
})
|
})
|
||||||
.catch(popupAjaxError)
|
.catch(popupAjaxError)
|
||||||
.finally(() => (this.searching = false));
|
.finally(() => (this.searching = false));
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<template>
|
||||||
|
{{#if this.searchEnabled}}
|
||||||
|
<div class="semantic-search__container search-results" role="region">
|
||||||
|
<div class="semantic-search__results" {{didInsert this.handleSearch}}>
|
||||||
|
<div
|
||||||
|
class="semantic-search__searching
|
||||||
|
{{if this.searching 'in-progress'}}"
|
||||||
|
>
|
||||||
|
<DToggleSwitch
|
||||||
|
disabled={{this.disableToggleSwitch}}
|
||||||
|
@state={{this.showingAIResults}}
|
||||||
|
title="AI search results hidden"
|
||||||
|
class="semantic-search__results-toggle"
|
||||||
|
{{on "click" this.toggleAIResults}}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div class="semantic-search__searching-text">
|
||||||
|
{{icon "discourse-sparkles"}}
|
||||||
|
{{this.searchStateText}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{#if this.searching}}
|
||||||
|
<span class="semantic-search__indicator-wave">
|
||||||
|
<span class="semantic-search__indicator-dot">.</span>
|
||||||
|
<span class="semantic-search__indicator-dot">.</span>
|
||||||
|
<span class="semantic-search__indicator-dot">.</span>
|
||||||
|
</span>
|
||||||
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
</template>
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue