The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
feat(advanced-filters): ensure filter component is working for every page
Pedro Ladeiraf0ac7789c581
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsxindex 51f7e43c81..a6642338fc 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx@@ -105,6 +105,7 @@ function WorkspaceLinks() {activeFilters,onSelect,onRemove,+ onRemoveFilter,onRemoveAll,setSearch,setSelectedFilter,@@ -262,6 +263,7 @@ function WorkspaceLinks() {activeFilters={activeFilters}onSelect={onSelect}onRemove={onRemove}+ onRemoveFilter={onRemoveFilter}onRemoveAll={onRemoveAll}/></PageWidthWrapper>diff --git a/apps/web/ui/analytics/toggle.tsx b/apps/web/ui/analytics/toggle.tsxindex ddc6856fc3..fcf3dbbcac 100644--- a/apps/web/ui/analytics/toggle.tsx+++ b/apps/web/ui/analytics/toggle.tsx@@ -83,7 +83,7 @@ export function AnalyticsToggle({onSelect={onSelect}onRemove={onRemove}onOpenFilter={onOpenFilter}- isMultiple={true}+ isAdvancedFilter={true}askAI/>);@@ -294,7 +294,7 @@ export function AnalyticsToggle({onRemoveFilter={onRemoveFilter}onRemoveAll={onRemoveAll}onToggleOperator={onToggleOperator}- isMultiple={true}+ isAdvancedFilter={true}/><divclassName={cn(diff --git a/apps/web/ui/links/use-link-filters.tsx b/apps/web/ui/links/use-link-filters.tsxindex 7a982f2d37..3cf63ef943 100644--- a/apps/web/ui/links/use-link-filters.tsx+++ b/apps/web/ui/links/use-link-filters.tsx@@ -40,6 +40,7 @@ export function useLinkFilters() {icon: Tag,label: "Tag",multiple: true,+ hideOperator: true,shouldFilter: !tagsAsync,getOptionIcon: (value, props) => {const tagColor =@@ -49,6 +50,11 @@ export function useLinkFilters() {<TagBadge color={tagColor} withIcon className="sm:p-1" />) : null;},+ getOptionLabel: (value, props) => {+ if (props.option?.label) return props.option.label;+ const tag = tags?.find(({ id }) => id === value);+ return tag?.name ?? value;+ },options:tags?.map(({ id, name, color, count, hideDuringSearch }) => ({value: id,@@ -111,10 +117,10 @@ export function useLinkFilters() {const { domain, tagIds, userId } = searchParamsObj;return [...(domain ? [{ key: "domain", value: domain }] : []),- ...(tagIds ? [{ key: "tagIds", value: selectedTagIds }] : []),+ ...(tagIds ? [{ key: "tagIds", values: selectedTagIds }] : []),...(userId ? [{ key: "userId", value: userId }] : []),];- }, [searchParamsObj]);+ }, [searchParamsObj, selectedTagIds]);const onSelect = (key: string, value: any) => {if (key === "tagIds") {@@ -152,6 +158,12 @@ export function useLinkFilters() {}};+ const onRemoveFilter = (key: string) => {+ queryParams({+ del: [key, "page"],+ });+ };+const onRemoveAll = () => {queryParams({del: ["domain", "tagIds", "userId", "search"],@@ -163,6 +175,7 @@ export function useLinkFilters() {activeFilters,onSelect,onRemove,+ onRemoveFilter,onRemoveAll,setSearch,setSelectedFilter,diff --git a/packages/ui/src/filter/filter-list.tsx b/packages/ui/src/filter/filter-list.tsxindex 964bf3f953..660aaf4ca1 100644--- a/packages/ui/src/filter/filter-list.tsx+++ b/packages/ui/src/filter/filter-list.tsx@@ -19,7 +19,7 @@ type FilterListProps = {onRemoveAll: () => void;onSelect?: (key: string, value: FilterOption["value"] | FilterOption["value"][]) => void;onToggleOperator?: (key: string) => void;- isMultiple?: boolean; // Enable multi-select features (operators, checkboxes, etc.)+ isAdvancedFilter?: boolean;className?: string;};@@ -67,7 +67,7 @@ export function FilterList({onRemoveAll,onSelect,onToggleOperator,- isMultiple = false,+ isAdvancedFilter = false,className,}: FilterListProps) {useKeyboardShortcut("Escape", onRemoveAll, { priority: 1 });@@ -237,7 +237,7 @@ export function FilterList({onRemoveFilter={onRemoveFilter}onSelect={onSelect}onToggleOperator={onToggleOperator}- isMultiple={isMultiple}+ isAdvancedFilter={isAdvancedFilter}/>);})}@@ -368,7 +368,7 @@ function OperatorFilterPill({onRemoveFilter,onSelect,onToggleOperator,- isMultiple = false,+ isAdvancedFilter = false,}: {filterKey: string;filter: Filter;@@ -381,7 +381,7 @@ function OperatorFilterPill({onRemoveFilter?: (key: string) => void;onSelect?: (key: string, value: FilterOption["value"] | FilterOption["value"][]) => void;onToggleOperator?: (key: string) => void;- isMultiple?: boolean;+ isAdvancedFilter?: boolean;}) {const [operatorDropdownOpen, setOperatorDropdownOpen] = useState(false);const [valueDropdownOpen, setValueDropdownOpen] = useState(false);@@ -401,8 +401,8 @@ function OperatorFilterPill({onSelect?.(filterKey, value);}- if (!isMultiple) setValueDropdownOpen(false);- }, [filterKey, values, onSelect, onRemove, isMultiple]);+ if (!isAdvancedFilter && !filter.multiple) setValueDropdownOpen(false);+ }, [filterKey, values, onSelect, onRemove, isAdvancedFilter, filter.multiple]);return (<motion.div@@ -421,7 +421,7 @@ function OperatorFilterPill({{filter.label}</div>- {isMultiple ? (+ {(isAdvancedFilter || filter.multiple) && !filter.hideOperator ? (<PopoveropenPopover={operatorDropdownOpen}setOpenPopover={setOperatorDropdownOpen}@@ -555,7 +555,7 @@ function OperatorFilterPill({}}value={optionLabel + option.value}>- {isMultiple && (+ {(isAdvancedFilter || filter.multiple) && (<div className={cn("flex h-4 w-4 items-center justify-center rounded border",isSelected ? "border-neutral-900 bg-neutral-900" : "border-neutral-300"@@ -568,7 +568,7 @@ function OperatorFilterPill({</span><span className="flex-1">{truncate(optionLabel, 48)}</span><div className="ml-1 flex shrink-0 justify-end text-neutral-500">- {isMultiple ? (+ {(isAdvancedFilter || filter.multiple) ? (option.right) : (isSelected ? (@@ -586,7 +586,7 @@ function OperatorFilterPill({<>{selectedOptions.map(renderOption)}- {isMultiple && selectedOptions.length > 0 && unselectedOptions.length > 0 && (+ {(isAdvancedFilter || filter.multiple) && selectedOptions.length > 0 && unselectedOptions.length > 0 && (<Command.Separator className="-mx-1 my-1 border-b border-neutral-200" />)}diff --git a/packages/ui/src/filter/filter-select.tsx b/packages/ui/src/filter/filter-select.tsxindex bb3e703fd8..299175e089 100644--- a/packages/ui/src/filter/filter-select.tsx+++ b/packages/ui/src/filter/filter-select.tsx@@ -29,7 +29,7 @@ type FilterSelectProps = {onSelectedFilterChange?: (key: string | null) => void;activeFilters?: ActiveFilterInput[];askAI?: boolean;- isMultiple?: boolean;+ isAdvancedFilter?: boolean;children?: ReactNode;emptyState?: ReactNode | Record<string, ReactNode>;className?: string;@@ -44,7 +44,7 @@ export function FilterSelect({onSelectedFilterChange,activeFilters,askAI,- isMultiple = false,+ isAdvancedFilter = false,children,emptyState,className,@@ -116,7 +116,7 @@ export function FilterSelect({const selectOption = useCallback((value: FilterOption["value"]) => {if (selectedFilter) {- const isSingleSelect = selectedFilter?.singleSelect || !isMultiple;+ const isSingleSelect = selectedFilter?.singleSelect || (!isAdvancedFilter && !selectedFilter?.multiple);if (isSingleSelect) {const isSelected = isOptionSelected(value);@@ -134,7 +134,7 @@ export function FilterSelect({}}},- [selectedFilter, isOptionSelected, onSelect, onRemove, isMultiple],+ [selectedFilter, isOptionSelected, onSelect, onRemove, isAdvancedFilter],);@@ -241,7 +241,7 @@ export function FilterSelect({selectedFilter.options?.filter((option) => !search || !option.hideDuringSearch)?.map((option) => {- const isSingleSelect = selectedFilter?.singleSelect || !isMultiple;+ const isSingleSelect = selectedFilter?.singleSelect || (!isAdvancedFilter && !selectedFilter?.multiple);const isSelected = isOptionSelected(option.value);return (@@ -249,7 +249,7 @@ export function FilterSelect({key={option.value}filter={selectedFilter}option={option}- showCheckbox={!isSingleSelect && isMultiple}+ showCheckbox={!isSingleSelect && (isAdvancedFilter || selectedFilter?.multiple)}isChecked={isSelected}right={isSingleSelect ? (diff --git a/packages/ui/src/filter/types.ts b/packages/ui/src/filter/types.tsindex 3c02e64273..13c97fa696 100644--- a/packages/ui/src/filter/types.ts+++ b/packages/ui/src/filter/types.ts@@ -18,6 +18,7 @@ export type Filter = {separatorAfter?: boolean;multiple?: boolean;singleSelect?: boolean; // Force single-select behavior even if multiSelect is enabled globally+ hideOperator?: boolean; // Hide the operator dropdown (is/is not) even when multiple is enabledgetOptionIcon?: (value: FilterOption["value"],props: { key: Filter["key"]; option?: FilterOption },