fix: update calcViewSearchParamsURL to support multi filters

nainglinnkhant · Jul 8, 2024 · 5f1f5e9 · 5f1f5e9
1 parent c0ab48d
commit 5f1f5e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/components/data-table/advanced/data-table-multi-filter.tsx b/src/components/data-table/advanced/data-table-multi-filter.tsx
@@ -107,10 +107,11 @@ export function DataTableMultiFilter<TData>({
             onClick={() => {
               setSelectedOptions((prev) => prev.filter((item) => !item.isMulti))
 
-              const paramsObj: Record<string, null> = {}
+              const paramsObj: Record<string, null | string> = {}
               for (const option of options) {
                 paramsObj[option.value as string] = null
               }
+              paramsObj.operator = "and"
 
               const newSearchParams = createQueryString(paramsObj, searchParams)
               router.push(`${pathname}?${newSearchParams}`, {

diff --git a/src/components/data-table/advanced/views/data-table-views-dropdown.tsx b/src/components/data-table/advanced/views/data-table-views-dropdown.tsx
@@ -66,9 +66,9 @@ export function DataTableViewsDropdown({
         <Button
           variant="outline"
           size="sm"
-          className="flex w-36 justify-between truncate"
+          className="flex w-36 justify-between"
         >
-          {currentView?.name || "All tasks"}
+          <span className="truncate">{currentView?.name || "All tasks"}</span>
           <CaretDownIcon aria-hidden="true" className="size-4 shrink-0" />
         </Button>
       </PopoverTrigger>

diff --git a/src/components/data-table/advanced/views/utils.ts b/src/components/data-table/advanced/views/utils.ts
@@ -50,7 +50,8 @@ export function calcViewSearchParamsURL(view: ViewItem) {
 
   for (const item of filterParams.filters ?? []) {
     if (FILTERABLE_FIELDS.includes(item.field)) {
-      searchParamsObj[item.field] = item.value
+      const value = item.isMulti ? `${item.value}~multi` : item.value
+      searchParamsObj[item.field] = value
     }
   }
   if (filterParams.operator) {