add ignore to igored_fields

Author: ahqsoftwares

web/load.mjs

@@ -66,7 +66,7 @@ const run = async (url, branch, arch) => {
           family: pkg_family || data.pkg_id,
           version: data.version,
           sha: data.shasum,
-          type: "base",
+          type: data.pkg_type || "none",
           size: data.size,
           sizeNum: genSize(data.size),
           category: data.category,

web/src/components/app.tsx

@@ -13,7 +13,7 @@ interface AppProps {
   downloadable?: boolean;
 }
 
-type FieldType = "link" | "version" | "size" | "date" | "hash" | "files" | "number" | "metric" | "category" | "default" | "links" | "tags" | "repology" | "provides" | "string[]" | "license";
+type FieldType = "link" | "version" | "size" | "date" | "hash" | "files" | "number" | "metric" | "category" | "default" | "links" | "tags" | "repology" | "provides" | "string[]" | "license" | "note";
 
 interface ResolverField {
   label: string;
@@ -36,7 +36,7 @@ const resolver: { [key: string]: ResolverField } = {
   app_id: { label: "Application ID", type: "default" },
   version: { label: "Version", type: "version" },
   version_upstream: { label: "Upstream Version", type: "version" },
-  note: { label: "Note", type: "string[]", joinWith: "\n" },
+  note: { label: "Note", type: "note", joinWith: "\n" },
   build_date: { label: "Build Date", type: "date" },
   size: { label: "Size", type: "size" },
   download_url: { label: "Download URL", type: "link" },
@@ -70,6 +70,8 @@ const resolver: { [key: string]: ResolverField } = {
   build_id: { label: "Build ID", type: "hash" },
 };
 
+const ignored_fields = ["distro_pkg"];
+
 function Show({ value, Key, props }: { value: any, props: AppProps, Key?: string }) {
   const { copy, copied } = useClipboard();
   const field: ResolverField = Key ? resolver[Key] || { label: Key, type: "default" } : { label: "Default", type: "default" };
@@ -176,6 +178,18 @@ function Show({ value, Key, props }: { value: any, props: AppProps, Key?: string
         </div>
       );
 
+    case "note":
+      const n = value as string[];
+      return (
+        <div className="flex flex-col flex-wrap gap-1">
+          {n.map((s) => {
+            return (
+              <span>{s}</span>
+            );
+          })}
+        </div>
+      );
+
     case "license":
       const l = value as string[];
       return (
@@ -310,6 +324,7 @@ export default function App({ data, logs: build, repo, downloadable = true }: Ap
 
               {
                 Object.entries(data)
+                  .filter(([key,]) => !ignored_fields.includes(key))
                   .map(([Key, Value]) => (
                     <TableRow key={"index_" + Key + Value}>
 

web/src/components/data-table.tsx

@@ -80,22 +80,26 @@ const updateUrlParams = (params: typeof initialFilters) => {
   if (params.column !== initialFilters.column) urlParams.set('searchBy', params.column);
   if (params.page !== initialFilters.page) urlParams.set('repo', params.page);
   if (params.search) urlParams.set('search', params.search);
-  
+
   const newUrl = `${window.location.pathname}${urlParams.toString() ? '?' + urlParams.toString() : ''}`;
   window.history.replaceState({}, '', newUrl);
 };
 
-export function DataTable<TData, TValue>({
-  columns,
-}: DataTableProps<TData, TValue>) {
+export function DataTable<TData>({
+  columns: col,
+}: { columns: (_: string) => ColumnDef<TData>[] }) {
   const urlParams = getUrlParams();
+
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
   const [column, setColumn] = React.useState(urlParams.column);
   const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>(getColumnVis());
   const [page, setPage] = React.useState(urlParams.page);
   const [data, setData] = React.useState<TData[] | "loading">(binX86 as unknown as TData[]);
 
+  const columns = React.useMemo(() => {
+    return col(page)
+  }, [page]);
 
   React.useEffect(() => {
     updateUrlParams(

web/src/components/list.tsx

@@ -29,10 +29,7 @@ interface ListItem {
 //   unitDisplay: "narrow",
 // });
 
-interface ListProps {
-  list: ListItem[]
-}
-const columns: ColumnDef<ListItem>[] = [
+const columns: (page: string) => ColumnDef<ListItem>[] = (page) => ([
   {
     accessorKey: "name",
     header: ({ column }) => {
@@ -159,30 +156,34 @@ const columns: ColumnDef<ListItem>[] = [
     }
   },
   {
-    accessorKey: "build_date",
+    accessorKey: page != "soarpkgs" ? "Build Date" : "Package Type",
     header: ({ column }) => {
       return (
         <div
           className="flex"
         >
-          Build Date
-          <Button
+          {page != "soarpkgs" ? "Build Date" : "Package Type"}
+          {page != "soarpkgs" && <Button
             variant="ghost"
             size="sm"
             className="ml-1 h-6 w-8 rounded-full"
             onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
           >
             <ArrowUpDown className="h-4 w-4" />
-          </Button>
+          </Button>}
         </div>
       )
     },
     cell: ({ row }) => {
-      const dat = row.getValue("build_date") as string;
+      const dat = row.original.build_date || row.original.type as string;
       const date = new Date(dat);
 
       const day = date.toLocaleDateString();
 
+      if (row.original.type) {
+        return <span className="text-gray-500 dark:text-gray-400 font-mono text-sm">{dat}</span>;
+      }
+
       if (day == "Invalid Date") {
         return <Tooltip>
           <TooltipTrigger>
@@ -204,18 +205,18 @@ const columns: ColumnDef<ListItem>[] = [
       </Tooltip>;
     },
   }
-]
+]);
 
-function ShowList({ list }: ListProps) {
+function ShowList() {
   return <TooltipProvider>
     <div className="mt-2 flex flex-col md:px-6 space-y-2 pb-3">
-      <DataTable columns={columns} data={list} />
+      <DataTable columns={columns} />
     </div>
   </TooltipProvider>;
 }
 
 export default function List() {
-  return <ShowList list={[]} />;
+  return <ShowList />;
 }
 
 function Category({ cat }: { cat: string }) {