Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: integrate new search API #39

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ jobs:
permissions:
contents: write
with:
node-version: "20"
pnpm-version: "9"
app-id: app-DlacW
ui-path: "."
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ jobs:
ci:
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v1
with:
node-version: "20"
pnpm-version: "9"
ui-path: "."
5 changes: 3 additions & 2 deletions packages/search-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
"prettier": "prettier \"**/*.{cjs,html,js,json,md,ts}\" --ignore-path ./.gitignore --write"
},
"dependencies": {
"lit": "^3.0.0",
"@halo-dev/api-client": "2.17.0",
"lit": "^3.1.4",
"lodash-es": "^4.17.21"
},
"devDependencies": {
"@types/lodash-es": "^4.17.10",
"@types/lodash-es": "^4.17.12",
"lit-analyzer": "^1.2.1"
}
}
53 changes: 38 additions & 15 deletions packages/search-widget/src/search-form.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { LitElement, html, css, PropertyValueMap } from 'lit';
import { HaloDocument, SearchOption, SearchResult } from '@halo-dev/api-client';
import { LitElement, PropertyValueMap, css, html } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
import { Ref, createRef, ref } from 'lit/directives/ref.js';
import type { Hit, Result } from './type';
import { debounce } from 'lodash-es';
import type { DebouncedFunc } from 'lodash-es';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
import { classMap } from 'lit/directives/class-map.js';
import type { DebouncedFunc } from 'lodash-es';
import { debounce } from 'lodash-es';
import baseStyles from './styles/base';
import varStyles from './styles/var';

Expand All @@ -20,7 +20,7 @@ export class SearchForm extends LitElement {
baseUrl = '';

@state()
private hits: Hit[] = [];
private searchResult?: SearchResult;

@state()
private loading: boolean = false;
Expand All @@ -43,7 +43,7 @@ export class SearchForm extends LitElement {
/>
</div>
<div class="search-form__result">
${!this.loading && this.hits.length === 0
${!this.loading && this.searchResult?.hits?.length === 0
? html`<div class="search-form__empty">
<span>没有搜索结果</span>
</div>`
Expand All @@ -52,7 +52,7 @@ export class SearchForm extends LitElement {
? html`<div class="search-form__loading"><span>搜索中...</span></div>`
: html`
<ul class="search-form__result-wrapper" role="list">
${this.hits.map(
${this.searchResult?.hits?.map(
(hit, index) =>
html`<li @click="${() => this.handleOpenLink(hit)}">
<div
Expand Down Expand Up @@ -107,7 +107,7 @@ export class SearchForm extends LitElement {
this.selectedIndex = 0;

if (value === '') {
this.hits = [];
this.searchResult = undefined;
return;
}

Expand All @@ -117,17 +117,37 @@ export class SearchForm extends LitElement {

fetchHits: DebouncedFunc<(keyword: string) => Promise<void>> = debounce(
async (keyword: string) => {
const options: SearchOption = {
annotations: {},
highlightPostTag: '</mark>',
highlightPreTag: '<mark>',
includeCategoryNames: [],
includeOwnerNames: [],
includeTagNames: [],
includeTypes: ['post'],
keyword,
limit: 20,
};

const response = await fetch(
`${this.baseUrl}/apis/api.halo.run/v1alpha1/indices/post?keyword=${keyword}&highlightPreTag=%3Cmark%3E&highlightPostTag=%3C/mark%3E`
`/apis/api.halo.run/v1alpha1/indices/-/search?keyword=${keyword}`,
{
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(options),
method: 'post',
}
);
const data = (await response.json()) as Result;
this.hits = data.hits || [];

const data = (await response.json()) as SearchResult;
this.searchResult = data;
this.loading = false;
},
300
);

handleOpenLink(hit: Hit) {
handleOpenLink(hit: HaloDocument) {
window.location.href = hit.permalink;
}

Expand All @@ -140,12 +160,15 @@ export class SearchForm extends LitElement {
}

if (key === 'ArrowDown' || (key === 'j' && ctrlKey)) {
this.selectedIndex = Math.min(this.hits.length, this.selectedIndex + 1);
this.selectedIndex = Math.min(
this.searchResult?.hits?.length || 0,
this.selectedIndex + 1
);
e.preventDefault();
}

if (key === 'Enter') {
const hit = this.hits[this.selectedIndex - 1];
const hit = this.searchResult?.hits?.[this.selectedIndex - 1];
if (hit) {
this.handleOpenLink(hit);
}
Expand Down
Loading