Skip to content

Commit dad4f05

Browse files
authored
Merge branch 'main' into feat/funnel-details-page
2 parents cad5361 + ae509b4 commit dad4f05

File tree

2 files changed

+28
-15
lines changed

2 files changed

+28
-15
lines changed

frontend/src/pages/AllErrors/index.tsx

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import cx from 'classnames';
88
import QuickFilters from 'components/QuickFilters/QuickFilters';
99
import { QuickFiltersSource } from 'components/QuickFilters/types';
1010
import RouteTab from 'components/RouteTab';
11+
import TypicalOverlayScrollbar from 'components/TypicalOverlayScrollbar/TypicalOverlayScrollbar';
1112
import { LOCALSTORAGE } from 'constants/localStorage';
1213
import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
1314
import ResourceAttributesFilterV2 from 'container/ResourceAttributeFilterV2/ResourceAttributesFilterV2';
@@ -60,21 +61,25 @@ function AllErrors(): JSX.Element {
6061
showFilters ? 'filter-visible' : '',
6162
)}
6263
>
63-
<Toolbar
64-
showAutoRefresh={false}
65-
leftActions={
66-
!showFilters ? (
67-
<Tooltip title="Show Filters">
68-
<Button onClick={handleFilterVisibilityChange} className="filter-btn">
69-
<FilterOutlined />
70-
</Button>
71-
</Tooltip>
72-
) : undefined
73-
}
74-
rightActions={<RightToolbarActions onStageRunQuery={handleRunQuery} />}
75-
/>
76-
<ResourceAttributesFilterV2 />
77-
<RouteTab routes={routes} activeKey={pathname} history={history} />
64+
<TypicalOverlayScrollbar>
65+
<>
66+
<Toolbar
67+
showAutoRefresh={false}
68+
leftActions={
69+
!showFilters ? (
70+
<Tooltip title="Show Filters">
71+
<Button onClick={handleFilterVisibilityChange} className="filter-btn">
72+
<FilterOutlined />
73+
</Button>
74+
</Tooltip>
75+
) : undefined
76+
}
77+
rightActions={<RightToolbarActions onStageRunQuery={handleRunQuery} />}
78+
/>
79+
<ResourceAttributesFilterV2 />
80+
<RouteTab routes={routes} activeKey={pathname} history={history} />
81+
</>
82+
</TypicalOverlayScrollbar>
7883
</section>
7984
</div>
8085
);

frontend/src/pages/AllErrors/utils.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import {
33
IQuickFiltersConfig,
44
} from 'components/QuickFilters/types';
55
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
6+
import { DataSource } from 'types/common/queryBuilder';
67

78
export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
89
{
910
type: FiltersType.CHECKBOX,
1011
title: 'Environment',
12+
dataSource: DataSource.TRACES,
1113
attributeKey: {
1214
key: 'deployment.environment',
1315
dataType: DataTypes.String,
@@ -20,6 +22,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
2022
{
2123
type: FiltersType.CHECKBOX,
2224
title: 'Service Name',
25+
dataSource: DataSource.TRACES,
2326
attributeKey: {
2427
key: 'service.name',
2528
dataType: DataTypes.String,
@@ -32,6 +35,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
3235
{
3336
type: FiltersType.CHECKBOX,
3437
title: 'Hostname',
38+
dataSource: DataSource.TRACES,
3539
attributeKey: {
3640
key: 'host.name',
3741
dataType: DataTypes.String,
@@ -44,6 +48,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
4448
{
4549
type: FiltersType.CHECKBOX,
4650
title: 'K8s Cluster Name',
51+
dataSource: DataSource.TRACES,
4752
attributeKey: {
4853
key: 'k8s.cluster.name',
4954
dataType: DataTypes.String,
@@ -56,6 +61,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
5661
{
5762
type: FiltersType.CHECKBOX,
5863
title: 'K8s Deployment Name',
64+
dataSource: DataSource.TRACES,
5965
attributeKey: {
6066
key: 'k8s.deployment.name',
6167
dataType: DataTypes.String,
@@ -68,6 +74,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
6874
{
6975
type: FiltersType.CHECKBOX,
7076
title: 'K8s Namespace Name',
77+
dataSource: DataSource.TRACES,
7178
attributeKey: {
7279
key: 'k8s.namespace.name',
7380
dataType: DataTypes.String,
@@ -80,6 +87,7 @@ export const ExceptionsQuickFiltersConfig: IQuickFiltersConfig[] = [
8087
{
8188
type: FiltersType.CHECKBOX,
8289
title: 'K8s Pod Name',
90+
dataSource: DataSource.TRACES,
8391
attributeKey: {
8492
key: 'k8s.pod.name',
8593
dataType: DataTypes.String,

0 commit comments

Comments
 (0)