refactor: integrate new search API (#39)

halo-dev · Jul 15, 2024 · 36df00c · 36df00c
1 parent 2d658d9
commit 36df00c
Show file tree

Hide file tree

Showing 6 changed files with 1,743 additions and 1,314 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -14,5 +14,7 @@ jobs:
     permissions:
       contents: write
     with:
+      node-version: "20"
+      pnpm-version: "9"
       app-id: app-DlacW
       ui-path: "."
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -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: "."
diff --git a/packages/search-widget/package.json b/packages/search-widget/package.json
@@ -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"
   }
 }
diff --git a/packages/search-widget/src/search-form.ts b/packages/search-widget/src/search-form.ts
@@ -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';
 
@@ -20,7 +20,7 @@ export class SearchForm extends LitElement {
   baseUrl = '';
 
   @state()
-  private hits: Hit[] = [];
+  private searchResult?: SearchResult;
 
   @state()
   private loading: boolean = false;
@@ -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>`
@@ -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
@@ -107,7 +107,7 @@ export class SearchForm extends LitElement {
     this.selectedIndex = 0;
 
     if (value === '') {
-      this.hits = [];
+      this.searchResult = undefined;
       return;
     }
 
@@ -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;
   }
 
@@ -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);
       }