Skip to content

fix(webui): Respect case sensitivity setting in search queries (fixes #1060); refactor Zustand usages. #1063

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

Merged
davemarco merged 7 commits into from
Jul 3, 2025
Merged

fix(webui): Respect case sensitivity setting in search queries (fixes #1060); refactor Zustand usages. #1063

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ef4958
latest
Jul 2, 2025
705da65
lint
Jul 2, 2025
562e309
latest
Jul 2, 2025
59db13d
latest
Jul 2, 2025
f48dfb4
review
Jul 3, 2025
671a943
status
Jul 3, 2025
33cd3f7
Merge branch 'main' into case
davemarco Jul 3, 2025
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
8 changes: 6 additions & 2 deletions components/webui/client/src/pages/SearchPage/SearchControls/SearchButton/SubmitButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ import styles from "./index.module.css";
* @return
*/
const SubmitButton = () => {
const {searchUiState, timeRange, queryString, updateTimelineConfig} = useSearchStore();
const searchUiState = useSearchStore((state) => state.searchUiState);
const timeRange = useSearchStore((state) => state.timeRange);
const queryString = useSearchStore((state) => state.queryString);
const updateTimelineConfig = useSearchStore((state) => state.updateTimelineConfig);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
Comment on lines +22 to +24

@junhaoliao junhaoliao Jul 3, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. ditto: order
  2. ditto: action retrieval
Suggested change
const searchUiState = useSearchStore((state) => state.searchUiState);
const timeRange = useSearchStore((state) => state.timeRange);
const queryString = useSearchStore((state) => state.queryString);
const updateTimelineConfig = useSearchStore((state) => state.updateTimelineConfig);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
const queryString = useSearchStore((state) => state.queryString);
const searchUiState = useSearchStore((state) => state.searchUiState);
const timelineConfig = useSearchStore((state) => state.timelineConfig);

...

    const handleTimelineZoom = useCallback((newTimeRange: [Dayjs, Dayjs]) => {
        const newTimelineConfig: TimelineConfig = computeTimelineConfig(newTimeRange);

        // Update range picker selection to match zoomed range.
        const {
            updateTimeRange, updateTimeRangeOption, updateTimelineConfig,
        } = useSearchStore.getState();

        updateTimeRange(newTimeRange);
        updateTimeRangeOption(TIME_RANGE_OPTION.CUSTOM);
        updateTimelineConfig(newTimelineConfig);

        const isQueryStringEmpty = queryString === SEARCH_STATE_DEFAULT.queryString;
        if (isQueryStringEmpty) {
            return;
        }

        handleQuerySubmit({
            ignoreCase: false === queryIsCaseSensitive,
            queryString: queryString,
            timeRangeBucketSizeMillis: newTimelineConfig.bucketDuration.asMilliseconds(),
            timestampBegin: newTimeRange[0].valueOf(),
            timestampEnd: newTimeRange[1].valueOf(),
        });
    }, [
        queryIsCaseSensitive,
        queryString,
    ]);

(also move handleTimelineZoom to show up before the useEffect() block)


/**
* Submits search query.
Expand All @@ -30,7 +34,7 @@ const SubmitButton = () => {
updateTimelineConfig(newTimelineConfig);

handleQuerySubmit({
ignoreCase: false,
ignoreCase: queryIsCaseSensitive,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
queryString: queryString,
timeRangeBucketSizeMillis: newTimelineConfig.bucketDuration.asMilliseconds(),
timestampBegin: timeRange[0].valueOf(),
Expand Down
21 changes: 11 additions & 10 deletions components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTimeline/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ import {computeTimelineConfig} from "./utils";
* @return
*/
const SearchResultsTimeline = () => {
const {
queryString,
updateTimeRange,
updateTimeRangeOption,
timelineConfig,
searchUiState,
updateTimelineConfig,
updateNumSearchResultsTimeline,
} = useSearchStore();
const queryString = useSearchStore((state) => state.queryString);
const updateTimeRange = useSearchStore((state) => state.updateTimeRange);
const updateTimeRangeOption = useSearchStore((state) => state.updateTimeRangeOption);
const timelineConfig = useSearchStore((state) => state.timelineConfig);
const searchUiState = useSearchStore((state) => state.searchUiState);
const updateTimelineConfig = useSearchStore((state) => state.updateTimelineConfig);
const updateNumSearchResultsTimeline = useSearchStore(
(state) => state.updateNumSearchResultsTimeline
);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);

@junhaoliao junhaoliao Jul 3, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const queryString = useSearchStore((state) => state.queryString);
const updateTimeRange = useSearchStore((state) => state.updateTimeRange);
const updateTimeRangeOption = useSearchStore((state) => state.updateTimeRangeOption);
const timelineConfig = useSearchStore((state) => state.timelineConfig);
const searchUiState = useSearchStore((state) => state.searchUiState);
const updateTimelineConfig = useSearchStore((state) => state.updateTimelineConfig);
const updateNumSearchResultsTimeline = useSearchStore(
(state) => state.updateNumSearchResultsTimeline
);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
const queryString = useSearchStore((state) => state.queryString);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
const searchUiState = useSearchStore((state) => state.searchUiState);
const timeRange = useSearchStore((state) => state.timeRange);

...

    const handleSubmitButtonClick = useCallback(() => {
        // Update timeline to match range picker selection.
        const newTimelineConfig = computeTimelineConfig(timeRange);
        const {updateTimelineConfig} = useSearchStore.getState();
        updateTimelineConfig(newTimelineConfig);

        handleQuerySubmit({
            ignoreCase: false === queryIsCaseSensitive,
            queryString: queryString,
            timeRangeBucketSizeMillis: newTimelineConfig.bucketDuration.asMilliseconds(),
            timestampBegin: timeRange[0].valueOf(),
            timestampEnd: timeRange[1].valueOf(),
        });
    }, [
        queryString,
        queryIsCaseSensitive,
        timeRange,
    ]);


const aggregationResults = useAggregationResults();

Expand Down Expand Up @@ -57,7 +58,7 @@ const SearchResultsTimeline = () => {
}

handleQuerySubmit({
ignoreCase: false,
ignoreCase: queryIsCaseSensitive,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
queryString: queryString,
timeRangeBucketSizeMillis: newTimelineConfig.bucketDuration.asMilliseconds(),
timestampBegin: newTimeRange[0].valueOf(),
Expand Down