Skip to content

fix(webui): do not review (title TBA) (fixes #1201) #1284

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix(webui): do not review (title TBA) (fixes #1201) #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3b0558
Fix webUI search on JSON logs without timestamp column, and add times…
quinntaylormitchell Aug 15, 2025
c624a42
chore: merge upstream main into feature branch
quinntaylormitchell Aug 19, 2025
be61910
remove user warning (moved to another PR)
quinntaylormitchell Sep 4, 2025
548a3f0
Merge branch 'main' into feature branch
quinntaylormitchell Sep 4, 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
4 changes: 2 additions & 2 deletions components/webui/client/src/api/search/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ type QueryJobCreationSchema = {
ignoreCase: boolean;
queryString: string;
timeRangeBucketSizeMillis: number;
timestampBegin: number;
timestampEnd: number;
timestampBegin: Nullable<number>;
timestampEnd: Nullable<number>;
};

/**
Expand Down
26 changes: 23 additions & 3 deletions ...ents/webui/client/src/pages/SearchPage/SearchControls/SearchButton/SubmitButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Button,
Tooltip,
} from "antd";
import dayjs from "dayjs";

import {
CLP_STORAGE_ENGINES,
Expand All @@ -14,6 +15,7 @@ import {computeTimelineConfig} from "../../../SearchResults/SearchResultsTimelin
import useSearchStore from "../../../SearchState/index";
import {SEARCH_UI_STATE} from "../../../SearchState/typings";
import {handleQuerySubmit} from "../../search-requests";
import {TIME_RANGE_OPTION} from "../../TimeRangeInput/utils";
import styles from "./index.module.css";


Expand All @@ -25,6 +27,7 @@ import styles from "./index.module.css";
const SubmitButton = () => {
const searchUiState = useSearchStore((state) => state.searchUiState);
const timeRange = useSearchStore((state) => state.timeRange);
const timeRangeOption = useSearchStore((state) => state.timeRangeOption);
const queryIsCaseSensitive = useSearchStore((state) => state.queryIsCaseSensitive);
const queryString = useSearchStore((state) => state.queryString);
const selectDataset = useSearchStore((state) => state.selectDataset);
Expand All @@ -39,7 +42,9 @@ const SubmitButton = () => {
const {updateTimelineConfig} = useSearchStore.getState();
updateTimelineConfig(newTimelineConfig);

if (CLP_STORAGE_ENGINES.CLP_S === SETTINGS_STORAGE_ENGINE) {
const usingClpS = (CLP_STORAGE_ENGINES.CLP_S === SETTINGS_STORAGE_ENGINE);

if (usingClpS) {
if (null !== selectDataset) {
updateCachedDataset(selectDataset);
} else {
Expand All @@ -49,17 +54,32 @@ const SubmitButton = () => {
}
}

let tBegin: dayjs.Dayjs | null;
let tEnd: dayjs.Dayjs | null;

if (usingClpS && TIME_RANGE_OPTION.ALL_TIME === timeRangeOption) {
tBegin = null;
tEnd = null;
} else {
[tBegin, tEnd] = timeRange;
}

handleQuerySubmit({
dataset: selectDataset,
ignoreCase: false === queryIsCaseSensitive,
queryString: queryString,
timeRangeBucketSizeMillis: newTimelineConfig.bucketDuration.asMilliseconds(),
timestampBegin: timeRange[0].valueOf(),
timestampEnd: timeRange[1].valueOf(),
timestampBegin: tBegin ?
tBegin.valueOf() :
null,
timestampEnd: tEnd ?
tEnd.valueOf() :
null,
});
}, [queryString,
queryIsCaseSensitive,
timeRange,
timeRangeOption,
selectDataset,
updateCachedDataset]);

Expand Down
6 changes: 4 additions & 2 deletions components/webui/server/src/schemas/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ const QueryJobCreationSchema = Type.Object({
ignoreCase: Type.Boolean(),
queryString: StringSchema,
timeRangeBucketSizeMillis: Type.Integer(),
timestampBegin: Type.Integer(),
timestampEnd: Type.Integer(),
timestampBegin: Type.Union([Type.Null(),
Type.Integer()]),
timestampEnd: Type.Union([Type.Null(),
Type.Integer()]),
});

/**
Expand Down
Loading