Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Auditlogs Filters now can be clicked on #2639

Merged
merged 6 commits into from
Nov 7, 2024
Merged

fix: Auditlogs Filters now can be clicked on #2639

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
834a53f
fix/Auditlogs-Filters-now-can-be-press-on-filter
BadriVishalPadhy Nov 3, 2024
be9ecc0
Merge branch 'main' into fix/Auditlogs-Filters-cannot-press-on-filter
BadriVishalPadhy Nov 3, 2024
f12a343
Merge branch 'main' into fix/Auditlogs-Filters-cannot-press-on-filter
chronark Nov 4, 2024
e9fc596
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 4, 2024
83303f4
Merge branch 'main' into fix/Auditlogs-Filters-cannot-press-on-filter
BadriVishalPadhy Nov 6, 2024
97595c3
Merge branch 'main' into fix/Auditlogs-Filters-cannot-press-on-filter
chronark Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions apps/dashboard/app/(app)/audit/[bucket]/filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,41 +72,36 @@ export const Filter: React.FC<Props> = ({ options, title, param }) => {
const isSelected = selected.includes(option.value);

return (
<CommandItem
/**
* We're simulating next/link behavior here and prefetching the page when they hover over an item
*/
onMouseEnter={() => {
const copySelected = new Set(selected);
if (isSelected) {
copySelected.delete(option.value);
} else {
copySelected.add(option.value);
}
// params.prefetch(param, Array.from(copySelected).join(","));
}}
key={option.value}
onSelect={() => {
<div
onMouseDownCapture={() => {
const next = isSelected
? selected.filter((v) => v !== option.value)
: Array.from(new Set([...selected, option.value]));

setSelected(next);
// params.set(param, next);
}}
>
chronark marked this conversation as resolved.
Show resolved Hide resolved
<div
className={cn(
"mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary",
isSelected
? "bg-primary text-primary-foreground"
: "opacity-50 [&_svg]:invisible",
)}
<CommandItem
key={option.value}
onSelect={() => {
const next = isSelected
? selected.filter((v) => v !== option.value)
: Array.from(new Set([...selected, option.value]));
setSelected(next);
}}
>
<Check className={cn("h-4 w-4")} />
</div>
<span className="truncate text-ellipsis">{option.label}</span>
</CommandItem>
<div
className={cn(
"mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary",
isSelected
? "bg-primary text-primary-foreground"
: "opacity-50 [&_svg]:invisible",
)}
>
<Check className={cn("h-4 w-4")} />
</div>
<span className="truncate text-ellipsis">{option.label}</span>
</CommandItem>
</div>
);
})}
</CommandGroup>
Expand Down
Loading