Skip to content

Commit a927d58

Browse files
committed
Remove UI filters from UI (#89793)
* Start moving some stuff * Move some stuff around * more * Transactions label * some snake casing * i18n fix * Remove unused ui filters endpoints * Updates to select * remove projections * Use urlHelpers.push * License change
1 parent c78a5a2 commit a927d58

File tree

79 files changed

+350
-669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+350
-669
lines changed

x-pack/plugins/apm/common/projections.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

x-pack/plugins/apm/public/components/app/Home/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { useTraceOverviewHref } from '../../shared/Links/apm/TraceOverviewLink';
1616
import { MainTabs } from '../../shared/main_tabs';
1717
import { ServiceMap } from '../ServiceMap';
1818
import { ServiceInventory } from '../service_inventory';
19-
import { TraceOverview } from '../TraceOverview';
19+
import { TraceOverview } from '../trace_overview';
2020

2121
interface Tab {
2222
key: string;

x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { AnomalyDetection } from '../../Settings/anomaly_detection';
2323
import { ApmIndices } from '../../Settings/ApmIndices';
2424
import { CustomizeUI } from '../../Settings/CustomizeUI';
2525
import { TraceLink } from '../../TraceLink';
26-
import { TransactionDetails } from '../../TransactionDetails';
26+
import { TransactionDetails } from '../../transaction_details';
2727
import {
2828
CreateAgentConfigurationRouteHandler,
2929
EditAgentConfigurationRouteHandler,

x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx renamed to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterBadgeList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import React from 'react';
99
import { EuiFlexGrid, EuiFlexItem, EuiBadge } from '@elastic/eui';
1010
import styled from 'styled-components';
1111
import { i18n } from '@kbn/i18n';
12-
import { unit, px, truncate } from '../../../../style/variables';
12+
import { unit, px, truncate } from '../../../../../style/variables';
1313

1414
const BadgeText = styled.div`
1515
display: inline-block;

x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx renamed to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import { i18n } from '@kbn/i18n';
2222
import styled from 'styled-components';
2323
import { FilterBadgeList } from './FilterBadgeList';
24-
import { unit, px } from '../../../../style/variables';
24+
import { unit, px } from '../../../../../style/variables';
2525
import { FilterTitleButton } from './FilterTitleButton';
2626

2727
const Popover = styled((EuiPopover as unknown) as FunctionComponent).attrs(

x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx renamed to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ import {
1515
import { i18n } from '@kbn/i18n';
1616
import styled from 'styled-components';
1717
import { Filter } from './Filter';
18-
import { useLocalUIFilters } from '../../../hooks/useLocalUIFilters';
19-
import { Projection } from '../../../../common/projections';
20-
import { LocalUIFilterName } from '../../../../common/ui_filter';
18+
import { useLocalUIFilters } from '../hooks/useLocalUIFilters';
19+
import { LocalUIFilterName } from '../../../../../common/ui_filter';
2120

2221
interface Props {
23-
projection: Projection;
2422
filterNames: LocalUIFilterName[];
2523
params?: Record<string, string | number | boolean | undefined>;
2624
showCount?: boolean;
@@ -33,7 +31,6 @@ const ButtonWrapper = styled.div`
3331
`;
3432

3533
function LocalUIFilters({
36-
projection,
3734
params,
3835
filterNames,
3936
children,
@@ -42,7 +39,6 @@ function LocalUIFilters({
4239
}: Props) {
4340
const { filters, setFilterValue, clearValues } = useLocalUIFilters({
4441
filterNames,
45-
projection,
4642
params,
4743
shouldFetch,
4844
});

x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts renamed to x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@
77

88
import { omit } from 'lodash';
99
import { useHistory } from 'react-router-dom';
10-
import { Projection } from '../../common/projections';
11-
import { pickKeys } from '../../common/utils/pick_keys';
10+
import { LocalUIFilterName } from '../../../../../common/ui_filter';
11+
import { pickKeys } from '../../../../../common/utils/pick_keys';
1212
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
13-
import { LocalUIFiltersAPIResponse } from '../../server/lib/ui_filters/local_ui_filters';
13+
import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/ui_filters/local_ui_filters';
1414
import {
1515
localUIFilters,
1616
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
17-
} from '../../server/lib/ui_filters/local_ui_filters/config';
18-
import { fromQuery, toQuery } from '../components/shared/Links/url_helpers';
19-
import { removeUndefinedProps } from '../context/url_params_context/helpers';
20-
import { useFetcher } from './use_fetcher';
21-
import { useUrlParams } from '../context/url_params_context/use_url_params';
22-
import { LocalUIFilterName } from '../../common/ui_filter';
17+
} from '../../../../../server/lib/ui_filters/local_ui_filters/config';
18+
import {
19+
fromQuery,
20+
toQuery,
21+
} from '../../../../components/shared/Links/url_helpers';
22+
import { removeUndefinedProps } from '../../../../context/url_params_context/helpers';
23+
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
24+
import { useFetcher } from '../../../../hooks/use_fetcher';
2325

2426
const getInitialData = (
2527
filterNames: LocalUIFilterName[]
@@ -31,12 +33,10 @@ const getInitialData = (
3133
};
3234

3335
export function useLocalUIFilters({
34-
projection,
3536
filterNames,
3637
params,
3738
shouldFetch,
3839
}: {
39-
projection: Projection;
4040
filterNames: LocalUIFilterName[];
4141
params?: Record<string, string | number | boolean | undefined>;
4242
shouldFetch: boolean;
@@ -72,7 +72,7 @@ export function useLocalUIFilters({
7272
(callApmApi) => {
7373
if (shouldFetch && urlParams.start && urlParams.end) {
7474
return callApmApi({
75-
endpoint: `GET /api/apm/ui_filters/local_filters/${projection}` as const,
75+
endpoint: `GET /api/apm/ui_filters/local_filters/rumOverview`,
7676
params: {
7777
query: {
7878
uiFilters: JSON.stringify(uiFilters),
@@ -87,7 +87,6 @@ export function useLocalUIFilters({
8787
}
8888
},
8989
[
90-
projection,
9190
uiFilters,
9291
urlParams.start,
9392
urlParams.end,

x-pack/plugins/apm/public/hooks/useCallApi.ts renamed to x-pack/plugins/apm/public/components/app/RumDashboard/hooks/use_call_api.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77

88
import { useMemo } from 'react';
9-
import { callApi } from '../services/rest/callApi';
10-
import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
11-
import { FetchOptions } from '../../common/fetch_options';
9+
import { callApi } from '../../../../services/rest/callApi';
10+
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
11+
import { FetchOptions } from '../../../../../common/fetch_options';
1212

1313
export function useCallApi() {
1414
const { http } = useApmPluginContext().core;

x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
* 2.0.
66
*/
77

8-
import React, { useMemo } from 'react';
98
import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
9+
import React, { useMemo } from 'react';
1010
import { useTrackPageview } from '../../../../../observability/public';
11-
import { Projection } from '../../../../common/projections';
11+
import { LocalUIFilters } from './LocalUIFilters';
1212
import { RumDashboard } from './RumDashboard';
13-
14-
import { LocalUIFilters } from '../../shared/LocalUIFilters';
1513
import { URLFilter } from './URLFilter';
1614

1715
export function RumOverview() {
@@ -21,7 +19,6 @@ export function RumOverview() {
2119
const localUIFiltersConfig = useMemo(() => {
2220
const config: React.ComponentProps<typeof LocalUIFilters> = {
2321
filterNames: ['location', 'device', 'os', 'browser'],
24-
projection: Projection.rumOverview,
2522
};
2623

2724
return config;

0 commit comments

Comments
 (0)