diff --git a/Common/UI/Components/CopyTextButton/CopyTextButton.tsx b/Common/UI/Components/CopyTextButton/CopyTextButton.tsx index 2c44254dc9..3085da86ae 100644 --- a/Common/UI/Components/CopyTextButton/CopyTextButton.tsx +++ b/Common/UI/Components/CopyTextButton/CopyTextButton.tsx @@ -54,14 +54,14 @@ const CopyTextButton: FunctionComponent = ( const variantClasses: Record = { ghost: - "bg-transparent border border-slate-600 text-slate-300 hover:bg-slate-700/40", - soft: "bg-slate-700 text-white border border-slate-600 hover:bg-slate-600", + "bg-transparent border border-gray-200 text-gray-400 hover:bg-gray-50 hover:text-gray-600", + soft: "bg-gray-100 text-gray-600 border border-gray-200 hover:bg-gray-200", solid: "bg-indigo-600 text-white border border-indigo-600 hover:bg-indigo-500", } as const; const copiedClasses: string = - "bg-emerald-600/20 border border-emerald-500 text-emerald-300"; + "bg-emerald-50 border border-emerald-200 text-emerald-600"; return (
-
+
= ( />
- + {props.count.toLocaleString()}
diff --git a/Common/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx b/Common/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx index 3524ff4d65..9e027646d2 100644 --- a/Common/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx +++ b/Common/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx @@ -106,7 +106,7 @@ const LogsFacetSidebar: FunctionComponent = ( }, [props.facetData]); return ( -
+

Filters diff --git a/Common/UI/Components/LogsViewer/components/LogsFilterCard.tsx b/Common/UI/Components/LogsViewer/components/LogsFilterCard.tsx index 10456dded5..30ecf7c715 100644 --- a/Common/UI/Components/LogsViewer/components/LogsFilterCard.tsx +++ b/Common/UI/Components/LogsViewer/components/LogsFilterCard.tsx @@ -33,9 +33,9 @@ const LogsFilterCard: FunctionComponent = ( ]; return ( -
-
-
+
+
+
= ( suggestions={searchBarSuggestions} />
- - - id="logs-filter" - showFilter={true} - filterData={props.filterData} - onFilterChanged={props.onFilterChanged} - onAdvancedFiltersToggle={props.onAdvancedFiltersToggle} - isFilterLoading={props.isFilterLoading} - filterError={props.filterError} - onFilterRefreshClick={props.onFilterRefreshClick} - filters={[ - { - key: "severityText", - filterDropdownOptions: - DropdownUtil.getDropdownOptionsFromEnum(LogSeverity), - type: FieldType.Dropdown, - title: "Log Severity", - isAdvancedFilter: true, - }, - { - key: "time", - type: FieldType.DateTime, - title: "Start and End Date", - isAdvancedFilter: true, - }, - { - key: "attributes", - type: FieldType.JSON, - title: "Filter by Attributes", - jsonKeys: props.logAttributes, - isAdvancedFilter: true, - }, - ]} - /> +
+ {props.toolbar} +
-
- {props.toolbar} -
+ + id="logs-filter" + showFilter={true} + filterData={props.filterData} + onFilterChanged={props.onFilterChanged} + onAdvancedFiltersToggle={props.onAdvancedFiltersToggle} + isFilterLoading={props.isFilterLoading} + filterError={props.filterError} + onFilterRefreshClick={props.onFilterRefreshClick} + filters={[ + { + key: "severityText", + filterDropdownOptions: + DropdownUtil.getDropdownOptionsFromEnum(LogSeverity), + type: FieldType.Dropdown, + title: "Log Severity", + isAdvancedFilter: true, + }, + { + key: "time", + type: FieldType.DateTime, + title: "Start and End Date", + isAdvancedFilter: true, + }, + { + key: "attributes", + type: FieldType.JSON, + title: "Filter by Attributes", + jsonKeys: props.logAttributes, + isAdvancedFilter: true, + }, + ]} + />
); }; diff --git a/Common/UI/Components/LogsViewer/components/LogsHistogram.tsx b/Common/UI/Components/LogsViewer/components/LogsHistogram.tsx index f24c48ab5e..cff085dd11 100644 --- a/Common/UI/Components/LogsViewer/components/LogsHistogram.tsx +++ b/Common/UI/Components/LogsViewer/components/LogsHistogram.tsx @@ -145,7 +145,7 @@ const LogsHistogram: FunctionComponent = ( if (props.isLoading && pivotedData.length === 0) { return ( -
+
); @@ -156,8 +156,8 @@ const LogsHistogram: FunctionComponent = ( } return ( -
-
+
+
= ( onMouseDown={handleMouseDown} onMouseMove={handleMouseMove} onMouseUp={handleMouseUp} - barCategoryGap="12%" + barCategoryGap="15%" > = ( dataKey={severity} stackId="severity" fill={getSeverityColor(severity).fill} - radius={[1, 1, 0, 0]} + radius={[3, 3, 0, 0]} isAnimationActive={false} /> ))} diff --git a/Common/UI/Components/LogsViewer/components/LogsTable.tsx b/Common/UI/Components/LogsViewer/components/LogsTable.tsx index c20ae981c6..a9829fc4ba 100644 --- a/Common/UI/Components/LogsViewer/components/LogsTable.tsx +++ b/Common/UI/Components/LogsViewer/components/LogsTable.tsx @@ -6,6 +6,7 @@ import OneUptimeDate from "../../../../Types/Date"; import CopyTextButton from "../../CopyTextButton/CopyTextButton"; import ComponentLoader from "../../ComponentLoader/ComponentLoader"; import SeverityBadge from "./SeverityBadge"; +import { getSeverityTheme, SeverityTheme } from "./severityTheme"; import SortOrder from "../../../../Types/BaseDatabase/SortOrder"; import Icon from "../../Icon/Icon"; import IconProp from "../../../../Types/Icon/IconProp"; @@ -114,7 +115,7 @@ const LogsTable: FunctionComponent = ( - Service + Service