-
Notifications
You must be signed in to change notification settings - Fork 612
feat: logs v2 selective display #2820
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
fc8fec6
fix: style issues
ogzhanolguncu 01ceecc
fix: focus issues of filters
ogzhanolguncu df73530
fix: search focus issue
ogzhanolguncu bebcf77
feat: add focus to control cloud
ogzhanolguncu 150987a
feat: adjust rows for dynamic selection
ogzhanolguncu b59a1c7
feat: add accessbility to display
ogzhanolguncu c7f877d
fix: show xx instead of direct status
ogzhanolguncu 9744826
fix: duplicate filter when querying openai
ogzhanolguncu fb61ef9
fix: remove workspace id from display selection
ogzhanolguncu 75ab35d
fix: show less precise time information when chart tooltip active
ogzhanolguncu 4c76174
fix: layout shift when doing AI search
ogzhanolguncu 6257f6a
fix: make them vertical instead of horizontal
ogzhanolguncu bbd55b7
fix: overflow issue when filter gets big
ogzhanolguncu 851c1f3
Merge branch 'main' into feat/logs-v2-selective-display
ogzhanolguncu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
169 changes: 169 additions & 0 deletions
169
.../(app)/logs-v2/components/controls/components/logs-display/components/display-popover.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| import { isDisplayProperty, useLogsContext } from "@/app/(app)/logs-v2/context/logs"; | ||
| import { useKeyboardShortcut } from "@/app/(app)/logs-v2/hooks/use-keyboard-shortcut"; | ||
| import { KeyboardButton } from "@/components/keyboard-button"; | ||
| import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; | ||
| import { | ||
| type KeyboardEvent, | ||
| type PropsWithChildren, | ||
| useCallback, | ||
| useEffect, | ||
| useState, | ||
| } from "react"; | ||
|
|
||
| const DISPLAY_PROPERTIES = [ | ||
| { id: "time", label: "Time" }, | ||
| { id: "response_status", label: "Status" }, | ||
| { id: "method", label: "Method" }, | ||
| { id: "path", label: "Path" }, | ||
| { id: "response_body", label: "Response Body" }, | ||
| { id: "request_id", label: "Request ID" }, | ||
| { id: "host", label: "Host" }, | ||
| { id: "request_headers", label: "Request Headers" }, | ||
| { id: "request_body", label: "Request Body" }, | ||
| { id: "response_headers", label: "Response Headers" }, | ||
| ]; | ||
|
|
||
| const DisplayPropertyItem = ({ | ||
| label, | ||
| selected, | ||
| onClick, | ||
| isFocused, | ||
| index, | ||
| }: { | ||
| label: string; | ||
| selected: boolean; | ||
| onClick: () => void; | ||
| isFocused: boolean; | ||
| index: number; | ||
| }) => ( | ||
| <div | ||
| data-item-index={index} | ||
| className={`font-medium text-xs p-1.5 rounded-md hover:bg-gray-4 cursor-pointer whitespace-nowrap | ||
| ${selected ? "bg-gray-4 text-gray-12" : "text-gray-9"} | ||
| ${isFocused ? "ring-2 ring-accent-7" : ""}`} | ||
| onClick={onClick} | ||
| tabIndex={isFocused ? 0 : -1} | ||
| role="button" | ||
| onKeyDown={(e) => { | ||
| if (e.key === "Enter" || e.key === " ") { | ||
| e.preventDefault(); | ||
| onClick(); | ||
| } | ||
| }} | ||
| > | ||
| {label} | ||
| </div> | ||
| ); | ||
|
|
||
| const PopoverHeader = () => ( | ||
| <div className="flex w-full justify-between items-center px-1 py-1"> | ||
| <span className="text-gray-9 text-[13px]">Display Properties...</span> | ||
| <KeyboardButton shortcut="D" /> | ||
| </div> | ||
| ); | ||
|
|
||
| export const DisplayPopover = ({ children }: PropsWithChildren) => { | ||
| const [open, setOpen] = useState(false); | ||
| const [focusedIndex, setFocusedIndex] = useState<number | null>(null); | ||
| const { displayProperties, toggleDisplayProperty } = useLogsContext(); | ||
|
|
||
| useKeyboardShortcut("d", () => { | ||
| setOpen((prev) => !prev); | ||
| if (!open) { | ||
| setFocusedIndex(0); | ||
| } | ||
| }); | ||
|
|
||
| const handleKeyNavigation = useCallback( | ||
| (e: KeyboardEvent) => { | ||
| const itemsPerRow = Math.floor(384 / 120); // Approximate width / item width | ||
| const totalItems = DISPLAY_PROPERTIES.length; | ||
| const currentRow = Math.floor((focusedIndex ?? 0) / itemsPerRow); | ||
| const currentCol = (focusedIndex ?? 0) % itemsPerRow; | ||
|
|
||
| const moveToIndex = (newIndex: number) => { | ||
| e.preventDefault(); | ||
| setFocusedIndex(Math.max(0, Math.min(newIndex, totalItems - 1))); | ||
| }; | ||
|
|
||
| switch (e.key) { | ||
| case "ArrowRight": | ||
| case "l": { | ||
| moveToIndex((focusedIndex ?? -1) + 1); | ||
| break; | ||
| } | ||
| case "ArrowLeft": | ||
| case "h": { | ||
| moveToIndex((focusedIndex ?? 1) - 1); | ||
| break; | ||
| } | ||
| case "ArrowDown": | ||
| case "j": { | ||
| const nextRowIndex = (currentRow + 1) * itemsPerRow + currentCol; | ||
| if (nextRowIndex < totalItems) { | ||
| moveToIndex(nextRowIndex); | ||
| } | ||
| break; | ||
| } | ||
| case "ArrowUp": | ||
| case "k": { | ||
| const prevRowIndex = (currentRow - 1) * itemsPerRow + currentCol; | ||
| if (prevRowIndex >= 0) { | ||
| moveToIndex(prevRowIndex); | ||
| } | ||
| break; | ||
| } | ||
| case "Enter": | ||
| case " ": { | ||
| if (focusedIndex !== null) { | ||
| const prop = DISPLAY_PROPERTIES[focusedIndex]; | ||
| if (isDisplayProperty(prop.id)) { | ||
| toggleDisplayProperty(prop.id); | ||
| } | ||
| } | ||
| break; | ||
| } | ||
| } | ||
| }, | ||
| [focusedIndex, toggleDisplayProperty], | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (!open) { | ||
| setFocusedIndex(null); | ||
| } | ||
| }, [open]); | ||
|
|
||
| return ( | ||
| <Popover open={open} onOpenChange={setOpen}> | ||
| <PopoverTrigger asChild>{children}</PopoverTrigger> | ||
| <PopoverContent | ||
| className="bg-gray-1 dark:bg-black drop-shadow-2xl p-2 border-gray-6 rounded-lg w-96" | ||
| align="start" | ||
| onKeyDown={handleKeyNavigation} | ||
| > | ||
| <div className="flex flex-col gap-2"> | ||
| <PopoverHeader /> | ||
| <div className="flex flex-wrap gap-2"> | ||
| {DISPLAY_PROPERTIES.map((prop, index) => ( | ||
| <DisplayPropertyItem | ||
| key={prop.id} | ||
| label={prop.label} | ||
| selected={displayProperties.has(prop.id as any)} | ||
| onClick={() => { | ||
| if (isDisplayProperty(prop.id)) { | ||
| toggleDisplayProperty(prop.id); | ||
| } | ||
| }} | ||
| isFocused={focusedIndex === index} | ||
| index={index} | ||
| /> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </PopoverContent> | ||
| </Popover> | ||
| ); | ||
| }; | ||
|
|
||
| export default DisplayPopover; | ||
23 changes: 23 additions & 0 deletions
23
apps/dashboard/app/(app)/logs-v2/components/controls/components/logs-display/index.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { Sliders } from "@unkey/icons"; | ||
| import { Button } from "@unkey/ui"; | ||
| import { cn } from "@unkey/ui/src/lib/utils"; | ||
| import { DisplayPopover } from "./components/display-popover"; | ||
|
|
||
| export const LogsDisplay = () => { | ||
| return ( | ||
| <DisplayPopover> | ||
| <div className="group"> | ||
| <Button | ||
| variant="ghost" | ||
| className={cn("group-data-[state=open]:bg-gray-4 px-2")} | ||
| aria-label="Filter logs" | ||
| aria-haspopup="true" | ||
| title="Press 'F' to toggle filters" | ||
| > | ||
| <Sliders className="text-accent-9 size-4" /> | ||
| <span className="text-accent-12 font-medium text-[13px]">Display</span> | ||
| </Button> | ||
| </div> | ||
| </DisplayPopover> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.