npm - @oneuptime/common - Versions diffs - 10.0.29 → 10.0.31 - Mend

@oneuptime/common 10.0.29 → 10.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/UI/Components/LogsViewer/components/LogsViewerToolbar.tsx CHANGED Viewed

@@ -7,6 +7,7 @@ import {
   LiveLogsOptions,
   LogsSavedViewOption,
   LogsTableColumnOption,
+  LogsViewMode,
 } from "../types";
 import RangeStartAndEndDateTime from "../../../../Types/Time/RangeStartAndEndDateTime";
@@ -28,6 +29,8 @@ export interface LogsViewerToolbarProps {
   availableColumns?: Array<LogsTableColumnOption> | undefined;
   selectedColumns?: Array<string> | undefined;
   onSelectedColumnsChange?: ((columns: Array<string>) => void) | undefined;
+  viewMode?: LogsViewMode | undefined;
+  onViewModeChange?: ((mode: LogsViewMode) => void) | undefined;
 }
 const LogsViewerToolbar: FunctionComponent<LogsViewerToolbarProps> = (
@@ -44,6 +47,63 @@ const LogsViewerToolbar: FunctionComponent<LogsViewerToolbarProps> = (
     >
       {/* Left group: View management + stats */}
       <div className="flex flex-wrap items-center gap-3">
+        {props.viewMode && props.onViewModeChange && (
+          <div className="inline-flex rounded-md shadow-sm" role="group">
+            <button
+              type="button"
+              className={`inline-flex items-center gap-1.5 rounded-l-md border px-3 py-1.5 text-xs font-medium transition-colors ${
+                props.viewMode === "list"
+                  ? "border-indigo-500 bg-indigo-50 text-indigo-700"
+                  : "border-gray-300 bg-white text-gray-700 hover:bg-gray-50"
+              }`}
+              onClick={() => {
+                props.onViewModeChange!("list");
+              }}
+            >
+              <svg
+                className="h-3.5 w-3.5"
+                fill="none"
+                viewBox="0 0 24 24"
+                strokeWidth={1.5}
+                stroke="currentColor"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 0 1 0 3.75H5.625a1.875 1.875 0 0 1 0-3.75Z"
+                />
+              </svg>
+              List
+            </button>
+            <button
+              type="button"
+              className={`inline-flex items-center gap-1.5 rounded-r-md border px-3 py-1.5 text-xs font-medium transition-colors ${
+                props.viewMode === "analytics"
+                  ? "border-indigo-500 bg-indigo-50 text-indigo-700"
+                  : "border-gray-300 bg-white text-gray-700 hover:bg-gray-50"
+              }`}
+              onClick={() => {
+                props.onViewModeChange!("analytics");
+              }}
+            >
+              <svg
+                className="h-3.5 w-3.5"
+                fill="none"
+                viewBox="0 0 24 24"
+                strokeWidth={1.5}
+                stroke="currentColor"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875v-6.75ZM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V8.625ZM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V4.125Z"
+                />
+              </svg>
+              Analytics
+            </button>
+          </div>
+        )}
         {props.savedViews && props.onSavedViewSelect && (
           <SavedViewsDropdown
             savedViews={props.savedViews}

package/UI/Components/LogsViewer/types.ts CHANGED Viewed

@@ -24,6 +24,8 @@ export interface ActiveFilter {
   displayValue: string;
 }
+export type LogsViewMode = "list" | "analytics";
 export interface LogsSavedViewOption {
   id: string;
   name: string;

package/build/dist/Server/API/TelemetryAPI.js CHANGED Viewed

@@ -151,6 +151,94 @@ router.post("/telemetry/logs/facets", UserMiddleware.getUserMiddleware, async (r
         next(err);
     }
 });
+// --- Log Analytics Endpoint ---
+router.post("/telemetry/logs/analytics", UserMiddleware.getUserMiddleware, async (req, res, next) => {
+    try {
+        const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
+        if (!(databaseProps === null || databaseProps === void 0 ? void 0 : databaseProps.tenantId)) {
+            return Response.sendErrorResponse(req, res, new BadDataException("Invalid Project ID"));
+        }
+        const body = req.body;
+        const chartType = body["chartType"] || "timeseries";
+        if (!["timeseries", "toplist", "table"].includes(chartType)) {
+            return Response.sendErrorResponse(req, res, new BadDataException("Invalid chartType"));
+        }
+        const aggregation = body["aggregation"] || "count";
+        if (!["count", "unique"].includes(aggregation)) {
+            return Response.sendErrorResponse(req, res, new BadDataException("Invalid aggregation"));
+        }
+        const startTime = body["startTime"]
+            ? OneUptimeDate.fromString(body["startTime"])
+            : OneUptimeDate.addRemoveHours(OneUptimeDate.getCurrentDate(), -1);
+        const endTime = body["endTime"]
+            ? OneUptimeDate.fromString(body["endTime"])
+            : OneUptimeDate.getCurrentDate();
+        const bucketSizeInMinutes = body["bucketSizeInMinutes"] ||
+            computeDefaultBucketSize(startTime, endTime);
+        const serviceIds = body["serviceIds"]
+            ? body["serviceIds"].map((id) => {
+                return new ObjectID(id);
+            })
+            : undefined;
+        const severityTexts = body["severityTexts"]
+            ? body["severityTexts"]
+            : undefined;
+        const bodySearchText = body["bodySearchText"]
+            ? body["bodySearchText"]
+            : undefined;
+        const traceIds = body["traceIds"]
+            ? body["traceIds"]
+            : undefined;
+        const spanIds = body["spanIds"]
+            ? body["spanIds"]
+            : undefined;
+        const groupBy = body["groupBy"]
+            ? body["groupBy"]
+            : undefined;
+        const aggregationField = body["aggregationField"]
+            ? body["aggregationField"]
+            : undefined;
+        const limit = body["limit"]
+            ? body["limit"]
+            : undefined;
+        const request = {
+            projectId: databaseProps.tenantId,
+            startTime,
+            endTime,
+            bucketSizeInMinutes,
+            chartType,
+            groupBy,
+            aggregation,
+            aggregationField,
+            serviceIds,
+            severityTexts,
+            bodySearchText,
+            traceIds,
+            spanIds,
+            limit,
+        };
+        if (chartType === "timeseries") {
+            const data = await LogAggregationService.getAnalyticsTimeseries(request);
+            return Response.sendJsonObjectResponse(req, res, {
+                data: data,
+            });
+        }
+        if (chartType === "toplist") {
+            const data = await LogAggregationService.getAnalyticsTopList(request);
+            return Response.sendJsonObjectResponse(req, res, {
+                data: data,
+            });
+        }
+        // table
+        const data = await LogAggregationService.getAnalyticsTable(request);
+        return Response.sendJsonObjectResponse(req, res, {
+            data: data,
+        });
+    }
+    catch (err) {
+        next(err);
+    }
+});
 // --- Helpers ---
 function computeDefaultBucketSize(startTime, endTime) {
     const diffMs = endTime.getTime() - startTime.getTime();

package/build/dist/Server/API/TelemetryAPI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,OAKN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAC9E,OAAO,~~qBAKN~~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"}
1	+ {"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/LogAggregationService.js CHANGED Viewed

@@ -109,6 +109,235 @@ export class LogAggregationService {
         }}`);
         return statement;
     }
+    static async getAnalyticsTimeseries(request) {
+        const statement = LogAggregationService.buildAnalyticsTimeseriesStatement(request);
+        const dbResult = await LogDatabaseService.executeQuery(statement);
+        const response = await dbResult.json();
+        const rows = response.data || [];
+        const groupByKeys = request.groupBy || [];
+        return rows.map((row) => {
+            const groupValues = {};
+            for (const key of groupByKeys) {
+                const alias = LogAggregationService.groupByAlias(key);
+                groupValues[key] = String(row[alias] || "");
+            }
+            return {
+                time: String(row["bucket"] || ""),
+                count: Number(row["cnt"] || 0),
+                groupValues,
+            };
+        });
+    }
+    static async getAnalyticsTopList(request) {
+        if (!request.groupBy || request.groupBy.length === 0) {
+            throw new BadDataException("groupBy with at least one dimension is required for top list");
+        }
+        const statement = LogAggregationService.buildAnalyticsTopListStatement(request);
+        const dbResult = await LogDatabaseService.executeQuery(statement);
+        const response = await dbResult.json();
+        const rows = response.data || [];
+        return rows
+            .map((row) => {
+            return {
+                value: String(row["val"] || ""),
+                count: Number(row["cnt"] || 0),
+            };
+        })
+            .filter((item) => {
+            return item.value.length > 0;
+        });
+    }
+    static async getAnalyticsTable(request) {
+        if (!request.groupBy || request.groupBy.length === 0) {
+            throw new BadDataException("groupBy with at least one dimension is required for table");
+        }
+        const statement = LogAggregationService.buildAnalyticsTableStatement(request);
+        const dbResult = await LogDatabaseService.executeQuery(statement);
+        const response = await dbResult.json();
+        const rows = response.data || [];
+        const groupByKeys = request.groupBy;
+        return rows.map((row) => {
+            const groupValues = {};
+            for (const key of groupByKeys) {
+                const alias = LogAggregationService.groupByAlias(key);
+                groupValues[key] = String(row[alias] || "");
+            }
+            return {
+                groupValues,
+                count: Number(row["cnt"] || 0),
+            };
+        });
+    }
+    static groupByAlias(key) {
+        if (LogAggregationService.isTopLevelColumn(key)) {
+            return key;
+        }
+        // For attribute keys, use a sanitized alias
+        return `attr_${key.replace(/[^a-zA-Z0-9_]/g, "_")}`;
+    }
+    static appendGroupBySelect(statement, groupByKeys) {
+        for (const key of groupByKeys) {
+            LogAggregationService.validateFacetKey(key);
+            if (LogAggregationService.isTopLevelColumn(key)) {
+                statement.append(`, toString(${key}) AS ${key}`);
+            }
+            else {
+                const alias = LogAggregationService.groupByAlias(key);
+                statement.append(SQL `, JSONExtractRaw(attributes, ${{
+                    type: TableColumnType.Text,
+                    value: key,
+                }}) AS ${alias}`);
+            }
+        }
+    }
+    static appendGroupByClause(statement, groupByKeys) {
+        for (const key of groupByKeys) {
+            if (LogAggregationService.isTopLevelColumn(key)) {
+                statement.append(`, ${key}`);
+            }
+            else {
+                const alias = LogAggregationService.groupByAlias(key);
+                statement.append(`, ${alias}`);
+            }
+        }
+    }
+    static getAggregationExpression(request) {
+        if (request.aggregation === "unique" && request.aggregationField) {
+            LogAggregationService.validateFacetKey(request.aggregationField);
+            if (LogAggregationService.isTopLevelColumn(request.aggregationField)) {
+                return `uniqExact(${request.aggregationField})`;
+            }
+            return `uniqExact(JSONExtractRaw(attributes, '${request.aggregationField.replace(/'/g, "\\'")}'))`;
+        }
+        return "count()";
+    }
+    static validateGroupBy(groupBy) {
+        if (!groupBy) {
+            return;
+        }
+        if (groupBy.length > LogAggregationService.MAX_GROUP_BY_DIMENSIONS) {
+            throw new BadDataException(`groupBy supports at most ${LogAggregationService.MAX_GROUP_BY_DIMENSIONS} dimensions`);
+        }
+        for (const key of groupBy) {
+            LogAggregationService.validateFacetKey(key);
+        }
+    }
+    static buildAnalyticsTimeseriesStatement(request) {
+        LogAggregationService.validateGroupBy(request.groupBy);
+        const intervalSeconds = request.bucketSizeInMinutes * 60;
+        const aggExpr = LogAggregationService.getAggregationExpression(request);
+        const statement = SQL `
+      SELECT
+        toStartOfInterval(time, INTERVAL ${{
+            type: TableColumnType.Number,
+            value: intervalSeconds,
+        }} SECOND) AS bucket`;
+        statement.append(`, ${aggExpr} AS cnt`);
+        if (request.groupBy && request.groupBy.length > 0) {
+            LogAggregationService.appendGroupBySelect(statement, request.groupBy);
+        }
+        statement.append(SQL `
+      FROM ${LogAggregationService.TABLE_NAME}
+      WHERE projectId = ${{
+            type: TableColumnType.ObjectID,
+            value: request.projectId,
+        }}
+        AND time >= ${{
+            type: TableColumnType.Date,
+            value: request.startTime,
+        }}
+        AND time <= ${{
+            type: TableColumnType.Date,
+            value: request.endTime,
+        }}`);
+        LogAggregationService.appendCommonFilters(statement, request);
+        statement.append(" GROUP BY bucket");
+        if (request.groupBy && request.groupBy.length > 0) {
+            LogAggregationService.appendGroupByClause(statement, request.groupBy);
+        }
+        statement.append(" ORDER BY bucket ASC");
+        return statement;
+    }
+    static buildAnalyticsTopListStatement(request) {
+        var _a;
+        const groupByKey = request.groupBy[0];
+        LogAggregationService.validateFacetKey(groupByKey);
+        const limit = (_a = request.limit) !== null && _a !== void 0 ? _a : LogAggregationService.DEFAULT_ANALYTICS_LIMIT;
+        const aggExpr = LogAggregationService.getAggregationExpression(request);
+        const isTopLevel = LogAggregationService.isTopLevelColumn(groupByKey);
+        const statement = new Statement();
+        if (isTopLevel) {
+            statement.append(`SELECT toString(${groupByKey}) AS val, ${aggExpr} AS cnt FROM ${LogAggregationService.TABLE_NAME}`);
+        }
+        else {
+            statement.append(`SELECT JSONExtractRaw(attributes, `);
+            statement.append(SQL `${{
+                type: TableColumnType.Text,
+                value: groupByKey,
+            }}`);
+            statement.append(`) AS val, ${aggExpr} AS cnt FROM ${LogAggregationService.TABLE_NAME}`);
+        }
+        statement.append(SQL ` WHERE projectId = ${{
+            type: TableColumnType.ObjectID,
+            value: request.projectId,
+        }} AND time >= ${{
+            type: TableColumnType.Date,
+            value: request.startTime,
+        }} AND time <= ${{
+            type: TableColumnType.Date,
+            value: request.endTime,
+        }}`);
+        if (!isTopLevel) {
+            statement.append(SQL ` AND JSONHas(attributes, ${{
+                type: TableColumnType.Text,
+                value: groupByKey,
+            }}) = 1`);
+        }
+        LogAggregationService.appendCommonFilters(statement, request);
+        statement.append(SQL ` GROUP BY val ORDER BY cnt DESC LIMIT ${{
+            type: TableColumnType.Number,
+            value: limit,
+        }}`);
+        return statement;
+    }
+    static buildAnalyticsTableStatement(request) {
+        var _a;
+        LogAggregationService.validateGroupBy(request.groupBy);
+        const groupByKeys = request.groupBy;
+        const limit = (_a = request.limit) !== null && _a !== void 0 ? _a : LogAggregationService.DEFAULT_ANALYTICS_LIMIT;
+        const aggExpr = LogAggregationService.getAggregationExpression(request);
+        const statement = new Statement();
+        statement.append(`SELECT ${aggExpr} AS cnt`);
+        LogAggregationService.appendGroupBySelect(statement, groupByKeys);
+        statement.append(SQL `
+      FROM ${LogAggregationService.TABLE_NAME}
+      WHERE projectId = ${{
+            type: TableColumnType.ObjectID,
+            value: request.projectId,
+        }}
+        AND time >= ${{
+            type: TableColumnType.Date,
+            value: request.startTime,
+        }}
+        AND time <= ${{
+            type: TableColumnType.Date,
+            value: request.endTime,
+        }}`);
+        LogAggregationService.appendCommonFilters(statement, request);
+        // Build GROUP BY from aliases
+        const aliases = groupByKeys.map((key) => {
+            if (LogAggregationService.isTopLevelColumn(key)) {
+                return key;
+            }
+            return LogAggregationService.groupByAlias(key);
+        });
+        statement.append(` GROUP BY ${aliases.join(", ")}`);
+        statement.append(SQL ` ORDER BY cnt DESC LIMIT ${{
+            type: TableColumnType.Number,
+            value: limit,
+        }}`);
+        return statement;
+    }
     static appendCommonFilters(statement, request) {
         if (request.serviceIds && request.serviceIds.length > 0) {
             statement.append(SQL ` AND serviceId IN (${{
@@ -172,6 +401,8 @@ LogAggregationService.TOP_LEVEL_COLUMNS = new Set([
 ]);
 LogAggregationService.ATTRIBUTE_KEY_PATTERN = /^[a-zA-Z0-9._:/-]+$/;
 LogAggregationService.MAX_FACET_KEY_LENGTH = 256;
+LogAggregationService.DEFAULT_ANALYTICS_LIMIT = 10;
+LogAggregationService.MAX_GROUP_BY_DIMENSIONS = 2;
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -184,5 +415,23 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], LogAggregationService, "getFacetValues", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], LogAggregationService, "getAnalyticsTimeseries", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], LogAggregationService, "getAnalyticsTopList", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], LogAggregationService, "getAnalyticsTable", null);
 export default LogAggregationService;
 //# sourceMappingURL=LogAggregationService.js.map

package/build/dist/Server/Services/LogAggregationService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"LogAggregationService.js","sourceRoot":"","sources":["../../../../Server/Services/LogAggregationService.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"LogAggregationService.js","sourceRoot":"","sources":["../../../../Server/Services/LogAggregationService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js CHANGED Viewed

@@ -88,6 +88,21 @@ export default class OnTriggerBaseModel extends TriggerCode {
         if (select && typeof select === "string") {
             select = JSONFunctions.parse(select);
         }
+        /*
+         * Convert string "true"/"false" values to booleans in select.
+         * Workflow arguments may pass select values as strings (e.g. "true")
+         * which causes TypeORM to iterate string characters as property indices.
+         */
+        if (select && typeof select === "object") {
+            for (const key in select) {
+                if (select[key] === "true") {
+                    select[key] = true;
+                }
+                else if (select[key] === "false") {
+                    select[key] = false;
+                }
+            }
+        }
         const model = await this.service.findOneById({
             id: new ObjectID(data["_id"].toString()),
             props: {

package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OnTriggerBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts"],"names":[],"mappings":"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~~AAtMuB~~;IADrB,WAAW,EAAE;;;;8CAyBb;AAGqB;IADrB,WAAW,EAAE;;;;~~6CA+Eb~~;AAGY;IADZ,WAAW,EAAE;;;;qDA0Fb"}
1	+ {"version":3,"file":"OnTriggerBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/LogsViewer/LogsViewer.js CHANGED Viewed

@@ -18,6 +18,7 @@ import LogsHistogram from "./components/LogsHistogram";
 import LogsFacetSidebar from "./components/LogsFacetSidebar";
 import ActiveFilterChips from "./components/ActiveFilterChips";
 import { CORE_LOGS_TABLE_COLUMN_OPTIONS, DEFAULT_LOGS_TABLE_COLUMNS, getLogsAttributeColumnId, normalizeLogsTableColumns, } from "./types";
+import LogsAnalyticsView from "./components/LogsAnalyticsView";
 import { queryStringToFilter } from "../../../Types/Log/LogQueryToFilter";
 import TimeRange from "../../../Types/Time/TimeRange";
 const DEFAULT_PAGE_SIZE = 100;
@@ -70,7 +71,7 @@ function resolveServiceNameToId(name, serviceMap) {
     return undefined;
 }
 const LogsViewer = (props) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const [filterData, setFilterData] = useState(props.filterData);
     const [searchQuery, setSearchQuery] = useState("");
     const [logAttributes, setLogAttributes] = useState([]);
@@ -85,6 +86,7 @@ const LogsViewer = (props) => {
     const [localSortField, setLocalSortField] = useState("time");
     const [localSortOrder, setLocalSortOrder] = useState(SortOrder.Descending);
     const [internalSelectedColumns, setInternalSelectedColumns] = useState(DEFAULT_LOGS_TABLE_COLUMNS);
+    const [internalViewMode, setInternalViewMode] = useState("list");
     useEffect(() => {
         setFilterData(props.filterData);
     }, [props.filterData]);
@@ -375,8 +377,16 @@ const LogsViewer = (props) => {
     if (pageError) {
         return React.createElement(ErrorMessage, { message: pageError });
     }
+    const currentViewMode = (_f = props.viewMode) !== null && _f !== void 0 ? _f : internalViewMode;
+    const handleViewModeChange = (mode) => {
+        var _a;
+        if (!props.viewMode) {
+            setInternalViewMode(mode);
+        }
+        (_a = props.onViewModeChange) === null || _a === void 0 ? void 0 : _a.call(props, mode);
+    };
     const toolbarProps = Object.assign(Object.assign(Object.assign({ resultCount: totalItems, currentPage,
-        totalPages, savedViews: props.savedViews, selectedSavedViewId: props.selectedSavedViewId, onSavedViewSelect: props.onSavedViewSelect, onCreateSavedView: props.onCreateSavedView, onEditSavedView: props.onEditSavedView, onDeleteSavedView: props.onDeleteSavedView, onUpdateCurrentSavedView: props.onUpdateCurrentSavedView }, (props.onSelectedColumnsChange || props.selectedColumns
+        totalPages, viewMode: currentViewMode, onViewModeChange: handleViewModeChange, savedViews: props.savedViews, selectedSavedViewId: props.selectedSavedViewId, onSavedViewSelect: props.onSavedViewSelect, onCreateSavedView: props.onCreateSavedView, onEditSavedView: props.onEditSavedView, onDeleteSavedView: props.onDeleteSavedView, onUpdateCurrentSavedView: props.onUpdateCurrentSavedView }, (props.onSelectedColumnsChange || props.selectedColumns
         ? {
             availableColumns,
             selectedColumns,
@@ -401,7 +411,7 @@ const LogsViewer = (props) => {
             React.createElement(LogsFilterCard, { logAttributes: logAttributes, searchQuery: searchQuery, onSearchQueryChange: setSearchQuery, onSearchSubmit: handleSearchSubmit, valueSuggestions: resolvedValueSuggestions, onFieldValueSelect: handleFieldValueSelectWithServiceResolve, toolbar: React.createElement(LogsViewerToolbar, Object.assign({}, toolbarProps)) }))),
         enrichedActiveFilters.length > 0 && props.onRemoveFilter && (React.createElement(ActiveFilterChips, { filters: enrichedActiveFilters, onRemove: props.onRemoveFilter, onClearAll: props.onClearAllFilters || (() => { }) })),
         props.histogramBuckets && (React.createElement(LogsHistogram, { buckets: props.histogramBuckets, isLoading: props.histogramLoading || false, onTimeRangeSelect: props.onHistogramTimeRangeSelect })),
-        React.createElement("div", { className: "flex gap-3" },
+        currentViewMode === "analytics" ? (React.createElement(LogsAnalyticsView, { timeRange: props.timeRange || { range: TimeRange.PAST_ONE_HOUR }, serviceIds: props.analyticsServiceIds, appliedFacetFilters: props.analyticsAppliedFacetFilters || new Map(), logAttributes: logAttributes })) : (React.createElement("div", { className: "flex gap-3" },
             showSidebar && props.facetData && (React.createElement(LogsFacetSidebar, { facetData: props.facetData, isLoading: props.facetLoading || false, serviceMap: serviceMap, onIncludeFilter: props.onFacetInclude || (() => { }), onExcludeFilter: props.onFacetExclude || (() => { }), activeFilters: props.activeFilters, savedViews: props.savedViews, selectedSavedViewId: props.selectedSavedViewId, onSavedViewSelect: props.onSavedViewSelect })),
             React.createElement("div", { className: "min-w-0 flex-1" },
                 React.createElement("div", { className: "overflow-hidden rounded-lg border border-gray-200 bg-white shadow-sm" },
@@ -420,7 +430,7 @@ const LogsViewer = (props) => {
                                     setSelectedLogId(null);
                                 }, getTraceRoute: props.getTraceRoute, getSpanRoute: props.getSpanRoute, variant: "embedded" }));
                         } }),
-                    React.createElement(LogsPagination, { currentPage: currentPage, totalItems: totalItems, pageSize: pageSize, pageSizeOptions: PAGE_SIZE_OPTIONS, onPageChange: handlePageChange, onPageSizeChange: handlePageSizeChange, isDisabled: props.isLoading || totalItems === 0 }))))));
+                    React.createElement(LogsPagination, { currentPage: currentPage, totalItems: totalItems, pageSize: pageSize, pageSizeOptions: PAGE_SIZE_OPTIONS, onPageChange: handlePageChange, onPageSizeChange: handlePageSizeChange, isDisabled: props.isLoading || totalItems === 0 })))))));
 };
 export default LogsViewer;
 //# sourceMappingURL=LogsViewer.js.map