Merge branch 'main' into datasetfix

Author: Marco

components/webui/client/eslint.config.mjs

@@ -35,9 +35,10 @@ const EslintConfig = [
                         // TypeBox imports
                         "Decode",
                         "Encode",
+                        "Type.Literal",
+                        "Type.Optional",
                         "Type.Transform",
                         "Type.Union",
-                        "Type.Literal",
                         "Value.Parse",
                     ],
                 },

components/webui/client/src/api/query/index.ts

@@ -2,6 +2,7 @@ import axios, {
     AxiosProgressEvent,
     AxiosResponse,
 } from "axios";
+import {Nullable} from "src/typings/common";
 
 import {
     ExtractStreamResp,
@@ -10,7 +11,7 @@ import {
 
 
 interface SubmitExtractStreamJobProps {
-    dataset: string;
+    dataset: Nullable<string>;
     extractJobType: QUERY_JOB_TYPE;
     streamId: string;
     logEventIdx: number;

components/webui/client/src/components/VirtualTable/index.tsx

@@ -23,19 +23,15 @@ const VirtualTable = <RecordType extends object = Record<string, unknown>>({
     ...tableProps
 }: VirtualTableProps<RecordType>) => {
     const containerRef = useRef<HTMLDivElement>(null);
-    const scrollNodeRef = useRef<HTMLElement>(null);
 
     const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLDivElement>) => {
         if (null === containerRef.current) {
             return;
         }
 
-        const scrollNode = scrollNodeRef.current;
-        if (null === scrollNode) {
-            scrollNodeRef.current = containerRef.current.querySelector<HTMLElement>(
-                VIRTUAL_TABLE_HOLDER_SELECTOR
-            );
-        }
+        const scrollNode = containerRef.current.querySelector<HTMLElement>(
+            VIRTUAL_TABLE_HOLDER_SELECTOR
+        );
 
         if (null === scrollNode) {
             return;

components/webui/client/src/pages/SearchPage/SearchControls/TimeRangeInput/index.tsx

@@ -46,7 +46,11 @@ const TimeRangeInput = () => {
             return;
         }
 
-        updateTimeRange(dates);
+        // Treat range picker selection as UTC by dropping any timezone offset supplied by antd.
+        updateTimeRange([
+            dates[0].utc(true),
+            dates[1].utc(true),
+        ]);
     };
 
     return (
@@ -68,8 +72,8 @@ const TimeRangeInput = () => {
                 onChange={handleSelectChange}/>
             {timeRangeOption === TIME_RANGE_OPTION.CUSTOM && (
                 <DatePicker.RangePicker
+                    allowClear={true}
                     className={styles["rangePicker"] || ""}
-                    showNow={true}
                     showTime={true}
                     size={"large"}
                     value={timeRange}

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Message/LogViewerLink.tsx

@@ -35,6 +35,16 @@ const LogViewerLink = ({
     const {token} = theme.useToken();
     const cachedDataset = useSearchStore((state) => state.cachedDataset);
 
+    const searchParams = new URLSearchParams({
+        type: encodeURIComponent(STREAM_TYPE),
+        streamId: encodeURIComponent(streamId),
+        logEventIdx: encodeURIComponent(logEventIdx),
+    });
+
+    if (null !== cachedDataset) {
+        searchParams.append("dataset", cachedDataset);
+    }
+
     return (
         <Tooltip title={"Open file"}>
             <Typography.Text>
@@ -44,11 +54,7 @@ const LogViewerLink = ({
                     target={"_blank"}
                     to={{
                         pathname: "/streamFile",
-                        search:
-                            `?type=${encodeURIComponent(STREAM_TYPE)}` +
-                            `&streamId=${encodeURIComponent(streamId)}` +
-                            `&logEventIdx=${encodeURIComponent(logEventIdx)}` +
-                            `&dataset=${encodeURIComponent(cachedDataset)}`,
+                        search: `?${searchParams.toString()}`,
                     }}
                 >
                     <LinkOutlined/>

components/webui/client/src/pages/SearchPage/SearchState/index.tsx

@@ -1,4 +1,5 @@
 import dayjs from "dayjs";
+import {Nullable} from "src/typings/common";
 import {create} from "zustand";
 
 import {TimelineConfig} from "../../../components/ResultsTimeline/typings";
@@ -16,7 +17,7 @@ import {SEARCH_UI_STATE} from "./typings";
  */
 const SEARCH_STATE_DEFAULT = Object.freeze({
     aggregationJobId: null,
-    cachedDataset: "",
+    cachedDataset: null,
     numSearchResultsTable: 0,
     numSearchResultsTimeline: 0,
     queryIsCaseSensitive: false,
@@ -40,7 +41,7 @@ interface SearchState {
      * dataset so modifications to the selector do not change dataset used in extract stream job for
      * log viewer links.
      */
-    cachedDataset: string;
+    cachedDataset: Nullable<string>;
 
     /**
      * The number of search table results.

components/webui/client/src/typings/query.ts

@@ -49,7 +49,7 @@ const ExtractJobSearchParams = Type.Object({
     ),
     streamId: Type.String(),
     logEventIdx: Type.Number(),
-    dataset: Type.String(),
+    dataset: Type.Optional(Type.String()),
 });
 
 interface ExtractStreamResp {

components/webui/client/src/ui/QueryStatus.tsx

@@ -65,17 +65,26 @@ const QueryStatus = () => {
             return;
         }
 
+        const {
+            dataset,
+            type,
+            logEventIdx,
+            streamId,
+        } = parseResult;
+
         submitExtractStreamJob({
-            dataset: parseResult.dataset,
+            dataset: "undefined" === typeof dataset ?
+                null :
+                dataset,
 
             // `parseResult.type` must be valid key since parsed using with typebox type
             // `ExtractJobSearchParams`.
-            extractJobType: EXTRACT_JOB_TYPE[parseResult.type as keyof typeof EXTRACT_JOB_TYPE],
-            logEventIdx: parseResult.logEventIdx,
+            extractJobType: EXTRACT_JOB_TYPE[type as keyof typeof EXTRACT_JOB_TYPE],
+            logEventIdx: logEventIdx,
             onUploadProgress: () => {
                 setQueryState(QUERY_LOADING_STATE.WAITING);
             },
-            streamId: parseResult.streamId,
+            streamId: streamId,
         })
             .then(({data}) => {
                 setQueryState(QUERY_LOADING_STATE.LOADING);