Merge pull request #19 from danilo-css/master

Improve FilterDialog UX

Author: danilo-css

components/FilterDialog.tsx

@@ -7,7 +7,14 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { useDuckDBStore } from "@/stores/useDuckDBStore";
-import { ChevronLeft, ChevronRight, Filter, Loader2 } from "lucide-react";
+import {
+  ChevronLeft,
+  ChevronRight,
+  Filter,
+  Loader2,
+  ChevronsLeft,
+  ChevronsRight,
+} from "lucide-react";
 import React, { useState } from "react";
 import { Button } from "./ui/button";
 import {
@@ -21,6 +28,13 @@ import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import { usePivotStore } from "@/stores/usePivotStore";
 import { Table as Arrow } from "apache-arrow";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import { ChevronDown, ChevronUp } from "lucide-react";
+import { Separator } from "./ui/separator";
 
 export default function FilterDialog({
   table,
@@ -40,6 +54,7 @@ export default function FilterDialog({
   const [searchQuery, setSearchQuery] = useState("");
   const [currentPage, setCurrentPage] = useState(1);
   const [open, setOpen] = useState(false);
+  const [isOpen, setIsOpen] = useState(true);
   const itemsPerPage = 10;
 
   const fetchData = async () => {
@@ -113,7 +128,7 @@ export default function FilterDialog({
       <DialogTrigger>
         <Filter size={20} className="cursor-pointer hover:text-black" />
       </DialogTrigger>
-      <DialogContent className="bg-gray-700">
+      <DialogContent className="bg-gray-700 max-h-[90vh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>Add filter</DialogTitle>
           <DialogDescription className="text-white">
@@ -177,7 +192,13 @@ export default function FilterDialog({
               </TableBody>
             </Table>
           </div>
-          <div className="flex justify-between items-center text-white">
+          <div className="flex justify-between items-center text-white gap-2">
+            <Button
+              onClick={() => setCurrentPage(1)}
+              disabled={currentPage === 1}
+            >
+              <ChevronsLeft />
+            </Button>
             <Button
               onClick={() => setCurrentPage((prev) => Math.max(prev - 1, 1))}
               disabled={currentPage === 1}
@@ -195,13 +216,38 @@ export default function FilterDialog({
             >
               <ChevronRight />
             </Button>
+            <Button
+              onClick={() => setCurrentPage(totalPages)}
+              disabled={currentPage === totalPages}
+            >
+              <ChevronsRight />
+            </Button>
           </div>
-          <p className="text-wrap break-all">
-            Selected values: {`[${selectedValues}]`}
-          </p>
           <Button onClick={handleSubmit} className="mt-4">
             Apply Filter
           </Button>
+          <Collapsible open={isOpen} onOpenChange={setIsOpen} className="mt-4">
+            <CollapsibleTrigger className="flex items-center justify-between w-full text-white p-2 hover:bg-gray-600 rounded-md">
+              <span>Selected values ({selectedValues.length})</span>
+              {isOpen ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
+            </CollapsibleTrigger>
+            <CollapsibleContent className="mt-2">
+              <ul className="space-y-1">
+                {selectedValues.map((value, index) => (
+                  <>
+                    <Separator orientation="horizontal" />
+                    <li
+                      key={index}
+                      className="text-white px-2 py-1 w-full text-ellipsis break-all"
+                      title={value}
+                    >
+                      {value}
+                    </li>
+                  </>
+                ))}
+              </ul>
+            </CollapsibleContent>
+          </Collapsible>
         </div>
       </DialogContent>
     </Dialog>

components/ui/collapsible.tsx

@@ -0,0 +1,11 @@
+"use client"
+
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
+
+const Collapsible = CollapsiblePrimitive.Root
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
+
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent }

components/ui/separator.tsx

@@ -0,0 +1,31 @@
+"use client"
+
+import * as React from "react"
+import * as SeparatorPrimitive from "@radix-ui/react-separator"
+
+import { cn } from "@/lib/utils"
+
+const Separator = React.forwardRef<
+  React.ElementRef<typeof SeparatorPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
+>(
+  (
+    { className, orientation = "horizontal", decorative = true, ...props },
+    ref
+  ) => (
+    <SeparatorPrimitive.Root
+      ref={ref}
+      decorative={decorative}
+      orientation={orientation}
+      className={cn(
+        "shrink-0 bg-border",
+        orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+Separator.displayName = SeparatorPrimitive.Root.displayName
+
+export { Separator }