-
Notifications
You must be signed in to change notification settings - Fork 88
feat(webui): Reorganize clp-s search controls onto two different lines; Remove text from buttons. #1853
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
Open
davemarco
wants to merge
4
commits into
y-scope:main
Choose a base branch
from
davemarco:move_ui
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat(webui): Reorganize clp-s search controls onto two different lines; Remove text from buttons. #1853
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
31 changes: 0 additions & 31 deletions
31
components/webui/client/src/pages/SearchPage/SearchControls/Native/NativeControls.tsx
This file was deleted.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
...ts/webui/client/src/pages/SearchPage/SearchControls/Native/NativeControls/ClpControls.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,20 @@ | ||
| import styles from "../../index.module.css"; | ||
| import TimeRangeInput from "../../TimeRangeInput"; | ||
| import QueryInput from "../QueryInput"; | ||
| import SearchButton from "../SearchButton"; | ||
|
|
||
|
|
||
| /** | ||
| * Renders CLP search controls. | ||
| * | ||
| * @return | ||
| */ | ||
| const ClpControls = () => ( | ||
| <div className={styles["inputsAndButtonRow"]}> | ||
| <QueryInput/> | ||
| <TimeRangeInput/> | ||
| <SearchButton/> | ||
| </div> | ||
| ); | ||
|
|
||
| export default ClpControls; |
30 changes: 30 additions & 0 deletions
30
...s/webui/client/src/pages/SearchPage/SearchControls/Native/NativeControls/ClpSControls.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,30 @@ | ||
| import Dataset from "../../Dataset"; | ||
| import TimeRangeInput from "../../TimeRangeInput"; | ||
| import QueryInput from "../QueryInput"; | ||
| import SearchButton from "../SearchButton"; | ||
| import nativeStyles from "./index.module.css"; | ||
|
|
||
|
|
||
| /** | ||
| * Renders CLP-S controls. | ||
| * | ||
| * @return | ||
| */ | ||
| const ClpSControls = () => ( | ||
| <> | ||
| <div className={nativeStyles["clpSRow"]}> | ||
| <Dataset/> | ||
| <div className={nativeStyles["clpSTimeRange"]}> | ||
| <TimeRangeInput/> | ||
| </div> | ||
| </div> | ||
| <div className={nativeStyles["clpSRow"]}> | ||
| <div className={nativeStyles["clpSQuery"]}> | ||
| <QueryInput/> | ||
| </div> | ||
| <SearchButton/> | ||
| </div> | ||
| </> | ||
| ); | ||
|
|
||
| export default ClpSControls; |
13 changes: 13 additions & 0 deletions
13
...s/webui/client/src/pages/SearchPage/SearchControls/Native/NativeControls/index.module.css
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,13 @@ | ||
| .clpSRow { | ||
| display: flex; | ||
| gap: 10px; | ||
| } | ||
|
|
||
| .clpSTimeRange { | ||
| margin-left: auto; | ||
| } | ||
|
|
||
| .clpSQuery { | ||
| flex: 1; | ||
| min-width: 0; | ||
| } | ||
30 changes: 30 additions & 0 deletions
30
components/webui/client/src/pages/SearchPage/SearchControls/Native/NativeControls/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,30 @@ | ||
| import {CLP_STORAGE_ENGINES} from "@webui/common/config"; | ||
|
|
||
| import {SETTINGS_STORAGE_ENGINE} from "../../../../../config"; | ||
| import styles from "../../index.module.css"; | ||
| import QueryStatus from "../../QueryStatus"; | ||
| import ClpControls from "./ClpControls"; | ||
| import ClpSControls from "./ClpSControls"; | ||
|
|
||
|
|
||
| /** | ||
| * Chooses between clp and clp-s native control layouts. | ||
| * | ||
| * @return | ||
| */ | ||
| const NativeControls = () => { | ||
| const isClpS = CLP_STORAGE_ENGINES.CLP_S === SETTINGS_STORAGE_ENGINE; | ||
|
|
||
| return ( | ||
| <div className={styles["searchControlsContainer"]}> | ||
| {isClpS ? | ||
| <ClpSControls/> : | ||
| <ClpControls/>} | ||
| <div className={styles["status"]}> | ||
| <QueryStatus/> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default NativeControls; |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick | 🔵 Trivial
Consider adding vertical alignment.
The
.clpSRowflex container lacksalign-items, which may cause inconsistent vertical alignment if child elements (search input, buttons, selectors) have different heights. Consider addingalign-items: center;for consistent vertical centering.Additionally, since
flex-wrapdefaults tonowrap, the controls might overflow horizontally on narrow screens.♻️ Proposed enhancement
.clpSRow { display: flex; gap: 10px; + align-items: center; }Please verify the layout behaviour on small screens (mobile/tablet viewports) to ensure controls remain accessible and don't overflow.
🤖 Prompt for AI Agents