From 24163b26440ac69b27c9ad7270ba873eb6697d4b Mon Sep 17 00:00:00 2001
From: Pablo Lara <larabjj@gmail.com>
Date: Tue, 1 Oct 2024 04:59:07 +0200
Subject: [PATCH] chore: Style tweaks for filters

---
 components/filters/data-filters.ts            |  2 +-
 components/filters/filter-controls.tsx        |  2 +-
 .../providers/table/columns-provider.tsx      |  2 +-
 .../table/data-table-filter-custom.tsx        | 15 ++--
 .../ui/custom/custom-dropdown-filter.tsx      | 75 ++++++++-----------
 components/ui/sidebar/SidebarWrap.tsx         |  2 +-
 6 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/components/filters/data-filters.ts b/components/filters/data-filters.ts
index eb05d0dc5e..9aea8e9dd3 100644
--- a/components/filters/data-filters.ts
+++ b/components/filters/data-filters.ts
@@ -6,7 +6,7 @@ export const filtersProviders = [
   },
   {
     key: "connected",
-    labelCheckboxGroup: "Status provider",
+    labelCheckboxGroup: "Connection",
     values: ["false", "true"],
   },
   // Add more filter categories as needed
diff --git a/components/filters/filter-controls.tsx b/components/filters/filter-controls.tsx
index 5f185a6629..13d4962b26 100644
--- a/components/filters/filter-controls.tsx
+++ b/components/filters/filter-controls.tsx
@@ -58,7 +58,7 @@ export const FilterControls: React.FC<FilterControlsProps> = ({
         {showClearButton && (
           <CustomButton
             ariaLabel="Reset"
-            className="w-fit"
+            className="w-full md:w-fit"
             onPress={clearAllFilters}
             variant="dashed"
             size="sm"
diff --git a/components/providers/table/columns-provider.tsx b/components/providers/table/columns-provider.tsx
index 5f19489948..e302a9dbfe 100644
--- a/components/providers/table/columns-provider.tsx
+++ b/components/providers/table/columns-provider.tsx
@@ -18,7 +18,7 @@ const getProviderData = (row: { original: ProviderProps }) => {
 
 export const ColumnsProvider: ColumnDef<ProviderProps>[] = [
   {
-    header: "n",
+    header: " ",
     cell: ({ row }) => <p className="text-medium">{row.index + 1}</p>,
   },
   {
diff --git a/components/providers/table/data-table-filter-custom.tsx b/components/providers/table/data-table-filter-custom.tsx
index 04e6df67f2..b43b55f3f4 100644
--- a/components/providers/table/data-table-filter-custom.tsx
+++ b/components/providers/table/data-table-filter-custom.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { Divider } from "@nextui-org/react";
 import { useRouter, useSearchParams } from "next/navigation";
 import React, { useState } from "react";
 import { useCallback } from "react";
@@ -37,7 +36,7 @@ export const DataTableFilterCustom = ({
   );
 
   return (
-    <div className="flex flex-row items-center gap-4">
+    <div className="flex flex-col md:flex-row md:items-start gap-4">
       <CustomButton
         ariaLabel={showFilters ? "Hide Filters" : "Show Filters"}
         variant="flat"
@@ -52,13 +51,13 @@ export const DataTableFilterCustom = ({
       </CustomButton>
 
       <div
-        className={`transition-all duration-500 ease-in-out ${
+        className={`transition-all duration-700 ease-in-out ${
           showFilters
-            ? "opacity-100 max-h-96 overflow-visible"
-            : "opacity-0 max-h-0 overflow-hidden"
+            ? "opacity-100 translate-x-0 w-full md:max-w-80 max-h-96 overflow-visible"
+            : "opacity-0 -translate-x-full max-h-0 overflow-hidden"
         }`}
       >
-        <div className="flex flex-row gap-4">
+        <div className="flex flex-col md:flex-row gap-4">
           {filters.map((filter) => (
             <CustomDropdownFilter
               key={filter.key}
@@ -69,10 +68,6 @@ export const DataTableFilterCustom = ({
               onFilterChange={pushDropdownFilter}
             />
           ))}
-          <div className="flex flex-row items-center gap-2">
-            <Divider className="text-default-800 h-5" orientation="vertical" />
-            <span className="text-sm text-default-800">Selected</span>
-          </div>
         </div>
       </div>
     </div>
diff --git a/components/ui/custom/custom-dropdown-filter.tsx b/components/ui/custom/custom-dropdown-filter.tsx
index 1911f3a961..29741c65dd 100644
--- a/components/ui/custom/custom-dropdown-filter.tsx
+++ b/components/ui/custom/custom-dropdown-filter.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import {
-  Badge,
   Button,
   Checkbox,
   CheckboxGroup,
@@ -9,6 +8,7 @@ import {
   Popover,
   PopoverContent,
   PopoverTrigger,
+  ScrollShadow,
 } from "@nextui-org/react";
 import _ from "lodash";
 import { useSearchParams } from "next/navigation";
@@ -90,11 +90,11 @@ export const CustomDropdownFilter: React.FC<CustomDropdownFilterProps> = ({
     }
   }, [groupSelected, allFilterKeys]);
   return (
-    <div className="flex w-full max-w-xs flex-col gap-2">
-      <Popover backdrop="opaque" placement="bottom">
+    <div className="flex flex-col w-full gap-2">
+      <Popover backdrop="transparent" placement="bottom-start">
         <PopoverTrigger>
           <Button
-            className="bg-default-100 text-default-800"
+            className="inline-flex items-center justify-center whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground rounded-md px-3 text-xs h-8 border-dashed"
             startContent={
               <PlusCircleIcon className="text-default-400" width={16} />
             }
@@ -105,33 +105,20 @@ export const CustomDropdownFilter: React.FC<CustomDropdownFilterProps> = ({
             {groupSelected.size > 0 && (
               <>
                 <Divider orientation="vertical" className="mx-2 h-4" />
-                <Badge
-                  variant="flat"
-                  className="rounded-sm px-1 font-normal lg:hidden"
-                >
-                  {groupSelected.size}
-                </Badge>
-                <div className="hidden space-x-1 lg:flex">
-                  {groupSelected.size > 2 ? (
-                    <Badge
-                      variant="flat"
-                      className="rounded-sm px-1 font-normal"
-                    >
-                      {groupSelected.size} selected
-                    </Badge>
-                  ) : (
-                    Array.from(groupSelected)
-                      .filter((value) => value !== "all")
-                      .map((value) => (
-                        <Badge
-                          variant="flat"
-                          key={value}
-                          className="rounded-sm px-1 font-normal"
-                        >
-                          {value}
-                        </Badge>
-                      ))
-                  )}
+
+                <div className="hidden space-x-1 lg:flex overflow-x-auto no-scrollbar">
+                  {groupSelected.size > 3
+                    ? `+${groupSelected.size - 2} selected`
+                    : Array.from(groupSelected)
+                        .filter((value) => value !== "all")
+                        .map((value) => (
+                          <div
+                            key={value}
+                            className="inline-flex items-center border py-0.5 text-xs transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 border-transparent bg-default-500 text-secondary-foreground hover:bg-default-500/80 rounded-sm px-2 font-normal"
+                          >
+                            {_.capitalize(value)}
+                          </div>
+                        ))}
                 </div>
               </>
             )}
@@ -144,7 +131,7 @@ export const CustomDropdownFilter: React.FC<CustomDropdownFilterProps> = ({
               label={filter?.labelCheckboxGroup}
               value={Array.from(groupSelected)}
               onValueChange={onSelectionChange}
-              className="text-small font-bold"
+              className="font-bold"
             >
               <Checkbox
                 className="font-normal"
@@ -153,23 +140,21 @@ export const CustomDropdownFilter: React.FC<CustomDropdownFilterProps> = ({
               >
                 Select All
               </Checkbox>
-              {allFilterKeys.map((value) => (
-                <Checkbox className="font-normal" key={value} value={value}>
-                  {_.capitalize(value)}
-                </Checkbox>
-              ))}
+              <Divider orientation="horizontal" className="mt-2" />
+              <ScrollShadow
+                hideScrollBar
+                className="flex flex-col gap-y-2 py-2 max-w-56 max-h-96"
+              >
+                {allFilterKeys.map((value) => (
+                  <Checkbox className="font-normal" key={value} value={value}>
+                    {_.capitalize(value)}
+                  </Checkbox>
+                ))}
+              </ScrollShadow>
             </CheckboxGroup>
           </div>
         </PopoverContent>
       </Popover>
-      {groupSelected?.size > 0 && (
-        <p className="text-small text-default-500">
-          Selected:{" "}
-          {Array.from(groupSelected)
-            .filter((item) => item !== "all")
-            .join(", ")}
-        </p>
-      )}
     </div>
   );
 };
diff --git a/components/ui/sidebar/SidebarWrap.tsx b/components/ui/sidebar/SidebarWrap.tsx
index 2da8d70670..6fcf559f93 100644
--- a/components/ui/sidebar/SidebarWrap.tsx
+++ b/components/ui/sidebar/SidebarWrap.tsx
@@ -42,7 +42,7 @@ export const SidebarWrap = () => {
   return (
     <div
       className={clsx(
-        "relative flex h-screen flex-col !border-r-small border-divider transition-width bg-prowler-blue-midnight",
+        "relative flex h-screen flex-col !border-r-small border-divider transition-width",
         {
           "w-72 p-6": !isCompact,
           "w-16 items-center px-2 py-6": isCompact,