Skip to content

Commit 7d9b268

Browse files
committed
fix: fixed the search
1 parent e986a4b commit 7d9b268

2 files changed

Lines changed: 9 additions & 27 deletions

File tree

web/src/components/data-table.tsx

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ const getColumnVis = () => {
8282
};
8383

8484
const initialFilters = {
85-
column: "name",
8685
columnVisibility: getColumnVis(),
8786
page: "bincache_amd64",
8887
search: "",
@@ -91,16 +90,13 @@ const initialFilters = {
9190
const getUrlParams = () => {
9291
const params = new URLSearchParams(window.location.search);
9392
return {
94-
column: params.get("searchBy") || initialFilters.column,
9593
page: params.get("repo") || initialFilters.page,
9694
search: params.get("search") || initialFilters.search,
9795
};
9896
};
9997

10098
const updateUrlParams = (params: typeof initialFilters) => {
10199
const urlParams = new URLSearchParams();
102-
if (params.column !== initialFilters.column)
103-
urlParams.set("searchBy", params.column);
104100
if (params.page !== initialFilters.page) urlParams.set("repo", params.page);
105101
if (params.search) urlParams.set("search", params.search);
106102

@@ -117,7 +113,6 @@ export function DataTable<TData>({
117113
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
118114
[],
119115
);
120-
const [column, setColumn] = React.useState(urlParams.column);
121116
const [columnVisibility, setColumnVisibility] =
122117
React.useState<VisibilityState>(getColumnVis());
123118
const [page, setPage] = React.useState(urlParams.page);
@@ -132,16 +127,15 @@ export function DataTable<TData>({
132127

133128
React.useEffect(() => {
134129
updateUrlParams({
135-
column,
136130
page,
137-
search: (table?.getColumn(column)?.getFilterValue() as string) || "",
131+
search: searchValue,
138132
columnVisibility,
139133
});
140-
}, [column, page, columnFilters, columnVisibility]);
134+
}, [page, columnFilters, columnVisibility, searchValue]);
141135

142136
React.useEffect(() => {
143137
if (urlParams.search) {
144-
table?.getColumn(urlParams.column)?.setFilterValue(urlParams.search);
138+
table?.getColumn('name')?.setFilterValue(urlParams.search);
145139
if (input.current) {
146140
input.current.value = urlParams.search;
147141
}
@@ -186,7 +180,6 @@ export function DataTable<TData>({
186180
getPaginationRowModel: getPaginationRowModel(),
187181
filterFns: {
188182
nameOrFamily: (row, columnId, filterValue) => {
189-
if (column === "category") return true;
190183
const searchLower = filterValue.toLowerCase();
191184
const name = (row.getValue("name") as string)?.toLowerCase() || "";
192185
const family = (row.getValue("family") as string)?.toLowerCase() || "";
@@ -197,7 +190,7 @@ export function DataTable<TData>({
197190
sorting,
198191
columnFilters,
199192
columnVisibility,
200-
globalFilter: column !== "category" ? searchValue : undefined,
193+
globalFilter: searchValue,
201194
}
202195
});
203196

@@ -218,9 +211,6 @@ export function DataTable<TData>({
218211

219212
const handleSearch = (value: string) => {
220213
setSearchValue(value);
221-
if (column === "category") {
222-
table.getColumn("category")?.setFilterValue(value);
223-
}
224214
};
225215

226216
return (
@@ -237,7 +227,7 @@ export function DataTable<TData>({
237227
}}
238228
>
239229
<Input
240-
placeholder={`Filter using ${column === "category" ? "category" : "name or package ID"}...`}
230+
placeholder='Filter using name or package ID...'
241231
ref={input}
242232
maxLength={64}
243233
onChange={(event) => {
@@ -276,18 +266,6 @@ export function DataTable<TData>({
276266
</SelectGroup>
277267
</SelectContent>
278268
</Select>
279-
<Select value={column} onValueChange={setColumn}>
280-
<SelectTrigger className="w-[180px] rounded-none">
281-
<SelectValue placeholder="Theme" />
282-
</SelectTrigger>
283-
<SelectContent>
284-
<SelectGroup>
285-
<SelectLabel>Filter among</SelectLabel>
286-
<SelectItem value="name">Name OR Package ID</SelectItem>
287-
<SelectItem value="category">Category</SelectItem>
288-
</SelectGroup>
289-
</SelectContent>
290-
</Select>
291269
<Tooltip>
292270
<TooltipTrigger
293271
className={buttonVariants({

web/src/components/list.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ const columns: (page: string) => ColumnDef<ListItem>[] = (page) => ([
9393
cell: ({ row }) => {
9494
const sha = row.getValue("sha") as string;
9595

96+
if (!sha) {
97+
return <p className="font-mono text-center"> - </p>
98+
}
99+
96100
return <Tooltip>
97101
<TooltipTrigger className="font-mono text-gray-600 dark:text-gray-400">{sha.length > 10 ? `${sha.substring(0, 10)}...` : sha}</TooltipTrigger>
98102
<TooltipContent className="text-wrap">

0 commit comments

Comments
 (0)