feat: support searchTerm in Filter Segment (#20526)

* feat: support searchTerm in Filter Segment

* update tests

* save and load searchTerm

* fix types

* add missing condition
This commit is contained in:
Eunjae Lee authored and GitHub committed 2025-04-07 05:27:58 -03:00
1 parent b6aedb830b
commit 703e20a43a
12 files changed
+133 -45

No files matched your search

@@ -172,6 +172,7 @@ export function DataTableProvider({
columnVisibility,
columnSizing,
pageSize,
searchTerm,
defaultPageSize,
segmentId,
setSegmentId,
@@ -181,6 +182,7 @@ export function DataTableProvider({
setColumnSizing,
setPageSize,
setPageIndex,
setSearchTerm,
});
const clearAll = useCallback(
@@ -1,7 +1,7 @@
"use client";
import type { Table } from "@tanstack/react-table";
import { forwardRef } from "react";
import { forwardRef, useEffect } from "react";
import type { ComponentPropsWithoutRef } from "react";
import { useState, type Ref, type ChangeEvent } from "react";
@@ -39,6 +39,10 @@ function SearchBarComponent({ className }: SearchBarProps, ref: Ref<HTMLInputEle
const { t } = useLocale();
const [localValue, setLocalValue] = useState(searchTerm);
useEffect(() => {
setLocalValue(searchTerm);
}, [searchTerm]);
const handleSearchChange = (event: ChangeEvent<HTMLInputElement>) => {
const value = event.target.value;
setLocalValue(value);
@@ -48,7 +52,7 @@ function SearchBarComponent({ className }: SearchBarProps, ref: Ref<HTMLInputEle
return (
<Input
ref={ref}
className={classNames("max-w-48" ,className)}
className={classNames("max-w-48", className)}
placeholder={t("search")}
value={localValue}
onChange={handleSearchChange}
@@ -52,6 +52,7 @@ export function SaveFilterSegmentButton() {
canSaveSegment,
setSegmentId,
pageSize,
searchTerm,
} = useDataTable();
const [saveMode, setSaveMode] = useState<"create" | "update">(() =>
@@ -105,6 +106,7 @@ export function SaveFilterSegmentButton() {
columnVisibility,
columnSizing,
perPage: pageSize,
searchTerm,
};
if (saveMode === "update") {
+20 -3
View File
@@ -14,6 +14,7 @@ type UseSegmentsProps = {
columnVisibility: VisibilityState;
columnSizing: ColumnSizingState;
pageSize: number;
searchTerm: string;
defaultPageSize: number;
segmentId: number;
setSegmentId: (segmentId: number | null) => void;
@@ -23,6 +24,7 @@ type UseSegmentsProps = {
setColumnSizing: (columnSizing: ColumnSizingState) => void;
setPageSize: (pageSize: number) => void;
setPageIndex: (pageIndex: number) => void;
setSearchTerm: (searchTerm: string | null) => void;
};
export function useSegments({
@@ -32,6 +34,7 @@ export function useSegments({
columnVisibility,
columnSizing,
pageSize,
searchTerm,
defaultPageSize,
segmentId,
setSegmentId,
@@ -41,6 +44,7 @@ export function useSegments({
setColumnSizing,
setPageSize,
setPageIndex,
setSearchTerm,
}: UseSegmentsProps) {
const { data: segments, isFetching: isFetchingSegments } = trpc.viewer.filterSegments.list.useQuery({
tableIdentifier,
@@ -81,6 +85,7 @@ export function useSegments({
setColumnVisibility(selectedSegment.columnVisibility);
setColumnSizing(selectedSegment.columnSizing);
setPageSize(selectedSegment.perPage);
setSearchTerm(selectedSegment.searchTerm);
setPageIndex(0);
}
}, [
@@ -91,6 +96,7 @@ export function useSegments({
setColumnSizing,
setPageSize,
setPageIndex,
setSearchTerm,
]);
const canSaveSegment = useMemo(() => {
@@ -101,7 +107,8 @@ export function useSegments({
sorting.length > 0 ||
Object.keys(columnVisibility).length > 0 ||
Object.keys(columnSizing).length > 0 ||
pageSize !== defaultPageSize
pageSize !== defaultPageSize ||
searchTerm?.length > 0
);
} else {
// if a segment is selected, we can save the segment if the active filters, sorting, etc. are different from the segment
@@ -110,10 +117,20 @@ export function useSegments({
!isEqual(sorting, selectedSegment.sorting) ||
!isEqual(columnVisibility, selectedSegment.columnVisibility) ||
!isEqual(columnSizing, selectedSegment.columnSizing) ||
!isEqual(pageSize, selectedSegment.perPage)
!isEqual(pageSize, selectedSegment.perPage) ||
!isEqual(searchTerm, selectedSegment.searchTerm)
);
}
}, [selectedSegment, activeFilters, sorting, columnVisibility, columnSizing, pageSize, defaultPageSize]);
}, [
selectedSegment,
activeFilters,
sorting,
columnVisibility,
columnSizing,
pageSize,
searchTerm,
defaultPageSize,
]);
const setSegmentIdAndSaveToLocalStorage = useCallback(
(segmentId: number | null) => {
@@ -247,6 +247,7 @@ export type FilterSegmentOutput = {
columnVisibility: Record<string, boolean>;
columnSizing: Record<string, number>;
perPage: number;
searchTerm: string | null;
createdAt: Date;
updatedAt: Date;
userId: number;