feat: enable search paging

MGP6775 · Aug 13, 2024 · aba6136 · aba6136
1 parent 75ee8f1
commit aba6136
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/pages/admin/state.ts b/pages/admin/state.ts
@@ -13,11 +13,11 @@ export const state = asState({
     oauth: <External<OAuthApp[]> | "loading"> "loading",
     files: <External<File[]> | "loading"> "loading",
     wallets: <External<Wallet[]> | "loading"> "loading",
-    search: <SearchResult[]> [],
-    searchStats: <External<{ total: number; took: number }> | "loading"> "loading",
+    search: <External<SearchResult[]> | "loading"> "loading",
+    searchQuery: <string> "",
 });
 
-export type SearchResult = { _index: "transcripts"; _source: Transcript } | { _index: "drops"; _source: Drop } | { _index: "servers"; _source: Server } | { _index: "users"; _source: ProfileData } | { _index: "files"; _source: File } | { _index: "none" } | { _index: "searching" };
+export type SearchResult = { _index: "transcripts"; _source: Transcript } | { _index: "drops"; _source: Drop } | { _index: "servers"; _source: Server } | { _index: "users"; _source: ProfileData } | { _index: "files"; _source: File } | { _index: "user-events"; _source: object } | { _index: "none" } | { _index: "searching" };
 
 export const reviewState = asState({
     // deno-lint-ignore no-explicit-any

diff --git a/pages/admin/views/menu.ts b/pages/admin/views/menu.ts
@@ -48,12 +48,11 @@ export const adminMenu = Navigation({
             title: ref`Search`,
             children: [
                 TextInput("text", "Search").onChange(debounce(async (data) => {
+                    if (!data) return;
                     state.search = asState([{ _index: "searching" }]);
-                    const elasticresults = await API.admin.search(data ?? "").then(stupidErrorAlert);
-                    state.search = asState(elasticresults.hits.hits);
-                    state.searchStats = asState({ total: elasticresults.hits.total.value, took: elasticresults.took });
+                    state.searchQuery = data;
+                    state.search = await API.admin.search(data ?? "").then(stupidErrorAlert);
                 }, 1000)),
-                state.$searchStats.map((it) => (it === "loading" || it.status === "rejected") ? Box() : Label(`${state.$searchStats.getValue().took}ms | ${state.$searchStats.getValue().total} Entries`)).asRefComponent(),
                 HeavyList(state.$search, (it) => {
                     switch (it._index) {
                         case "transcripts":
@@ -107,7 +106,8 @@ export const adminMenu = Navigation({
                     console.log("Unimplemented Type", it);
                     return placeholder("Unimplemented Type", "Please implement");
                 })
-                    .setPlaceholder(placeholder("No Results", "No results found.")),
+                    .setPlaceholder(placeholder("No Results", "No results found."))
+                    .enablePaging((offset, limit) => loadMore(state.$search, () => API.admin.search(state.searchQuery, offset, limit))),
             ],
         },
         {

diff --git a/pages/shared/restSpec.ts b/pages/shared/restSpec.ts
@@ -1,4 +1,5 @@
 import { Artist, BugReport, Drop, DropType, File, Group, Meta, OAuthApp, Payout, RequestPayoutResponse, Server, ServerAudit, ServerCreate, ServerTypes, Song, StoreItems, Wallet } from "../../spec/music.ts";
+import { SearchResult } from "../admin/state.ts";
 import { ProfileData } from "./helper.ts";
 
 export const Permissions = [
@@ -273,7 +274,7 @@ export const API = {
             return fetch(`${API.BASE_URL}admin/search/${query}?${paging}`, {
                 headers: headers(API.getToken()),
             })
-                .then(json<object[]>())
+                .then(json<SearchResult[]>())
                 .catch(reject)
         },
         files: {