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

Jump to bottom

Dylan/s3en 2508 make the scroll bar on this advanced filter show by default #178

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Dylan/s3en 2508 make the scroll bar on this advanced filter show by default #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a410eb6
sticky footer, visible scroll
dylanzuber-scale3 Jul 8, 2024
0c51ffb
Merge remote-tracking branch 'origin/development' into dylan/s3en-250…
dylanzuber-scale3 Jul 8, 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
172 changes: 87 additions & 85 deletions components/project/traces/trace-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,96 +134,98 @@ export default function FilterDialog({

return (
<Dialog open={open} onOpenChange={onClose}>
<DialogContent className="max-w-3xl h-[90vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Filter Traces</DialogTitle>
<DialogDescription>
Select filters to apply to the traces.
</DialogDescription>
</DialogHeader>
<VendorDropdown
selectedFilters={selectedFilters}
handleFilterChange={handleFilterChange}
/>
<div>
<h4 className="mt-4">Attributes</h4>
{advancedFilters.map((filter, index) => (
<div key={index} className="flex items-center mt-2 space-x-2">
<AttributesCombobox
initialAttribute={filter.attribute}
setSelectedAttribute={(attribute) =>
updateAdvancedFilter(index, "attribute", attribute)
}
/>
<OperatorCombox
initialOperator={filter.operator}
setSelectedOperator={(operator) =>
updateAdvancedFilter(index, "operator", operator)
}
/>
<Input
placeholder="Value"
value={filter.value}
onChange={(e) =>
updateAdvancedFilter(index, "value", e.target.value)
}
className="mr-2"
/>
<DialogContent className="max-w-3xl h-[90vh] overflow-y-scroll flex flex-col">
<div className="flex-grow overflow-y-auto">
<DialogHeader>
<DialogTitle>Filter Traces</DialogTitle>
<DialogDescription>
Select filters to apply to the traces.
</DialogDescription>
</DialogHeader>
<VendorDropdown
selectedFilters={selectedFilters}
handleFilterChange={handleFilterChange}
/>
<div>
<h4 className="mt-4">Attributes</h4>
{advancedFilters.map((filter, index) => (
<div key={index} className="flex items-center mt-2 space-x-2">
<AttributesCombobox
initialAttribute={filter.attribute}
setSelectedAttribute={(attribute) =>
updateAdvancedFilter(index, "attribute", attribute)
}
/>
<OperatorCombox
initialOperator={filter.operator}
setSelectedOperator={(operator) =>
updateAdvancedFilter(index, "operator", operator)
}
/>
<Input
placeholder="Value"
value={filter.value}
onChange={(e) =>
updateAdvancedFilter(index, "value", e.target.value)
}
className="mr-2"
/>
<Button
variant={"destructive"}
onClick={() => removeAdvancedFilter(index)}
>
Remove
</Button>
</div>
))}
<Button
variant={"secondary"}
onClick={addAdvancedFilter}
className="mt-2"
>
Add Attribute
</Button>
</div>
<div>
<h4 className="mt-4">User Id</h4>
<UserCombobox
selectedUser={selectedUserId}
setSelectedUser={setSelectedUserId}
/>
</div>
<div>
<h4 className="mt-4">Prompt Id</h4>
<PromptCombobox
selectedPrompt={selectedPromptId}
setSelectedPrompt={setSelectedPromptId}
/>
</div>
<DialogFooter className="sticky bottom-0 bg-white py-4">
<Button variant={"outline"} onClick={onClose}>
Cancel
</Button>
{(selectedFilters.length > 0 ||
advancedFilters.length > 0 ||
selectedUserId !== "" ||
selectedPromptId !== "") && (
<Button
variant={"destructive"}
onClick={() => removeAdvancedFilter(index)}
onClick={() => {
setSelectedFilters([]);
setAdvancedFilters([]);
setSelectedUserId("");
setSelectedPromptId("");
}}
>
Remove
<ClearIcon className="h-4 w-4" />
Clear Filters
</Button>
</div>
))}
<Button
variant={"secondary"}
onClick={addAdvancedFilter}
className="mt-2"
>
Add Attribute
</Button>
</div>
<div>
<h4 className="mt-4">User Id</h4>
<UserCombobox
selectedUser={selectedUserId}
setSelectedUser={setSelectedUserId}
/>
</div>
<div>
<h4 className="mt-4">Prompt Id</h4>
<PromptCombobox
selectedPrompt={selectedPromptId}
setSelectedPrompt={setSelectedPromptId}
/>
</div>
<DialogFooter>
<Button variant={"outline"} onClick={onClose}>
Cancel
</Button>
{(selectedFilters.length > 0 ||
advancedFilters.length > 0 ||
selectedUserId !== "" ||
selectedPromptId !== "") && (
<Button
variant={"destructive"}
onClick={() => {
setSelectedFilters([]);
setAdvancedFilters([]);
setSelectedUserId("");
setSelectedPromptId("");
}}
>
<ClearIcon className="h-4 w-4" />
Clear Filters
)}
<Button variant={"default"} onClick={applyFilters} color="primary">
Apply Filters
</Button>
)}
<Button variant={"default"} onClick={applyFilters} color="primary">
Apply Filters
</Button>
</DialogFooter>
</DialogFooter>
</div>
</DialogContent>
</Dialog>
);
Expand Down