Skip to content

[APM] Only fetch custom links for users with a valid license #83836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 20, 2020
Merged

[APM] Only fetch custom links for users with a valid license #83836

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cc49b9
[APM] Only fetch custom links when user has valid license
sorenlouv Nov 19, 2020
7071949
Rename more files for consistency
sorenlouv Nov 19, 2020
63c32b6
i18n fixes
sorenlouv Nov 19, 2020
e118a44
Fix tests
sorenlouv Nov 19, 2020
5f48ffe
Addess feedback and minor cleanup
sorenlouv Nov 20, 2020
b9d8f4c
Fix test (and more cleanup)
sorenlouv Nov 20, 2020
0300ccc
Make cachable
sorenlouv Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
roots: [`${rootDir}/common`, `${rootDir}/public`, `${rootDir}/server`],
collectCoverage: true,
collectCoverageFrom: [
...(jestConfig.collectCoverageFrom ?? []),
...(jestConfig.collectCoverageFrom || []),
'**/*.{js,mjs,jsx,ts,tsx}',
'!**/*.stories.{js,mjs,ts,tsx}',
'!**/dev_docs/**',
Expand Down
0 ...tomLink/CustomLinkFlyout/DeleteButton.tsx → ...eateEditCustomLinkFlyout/DeleteButton.tsx
View file
Open in desktop
File renamed without changes.
0 ...omLink/CustomLinkFlyout/Documentation.tsx → ...ateEditCustomLinkFlyout/Documentation.tsx
View file
Open in desktop
File renamed without changes.
0 ...mLink/CustomLinkFlyout/FiltersSection.tsx → ...teEditCustomLinkFlyout/FiltersSection.tsx
View file
Open in desktop
File renamed without changes.
0 ...tomLink/CustomLinkFlyout/FlyoutFooter.tsx → ...eateEditCustomLinkFlyout/FlyoutFooter.tsx
View file
Open in desktop
File renamed without changes.
0 ...stomLink/CustomLinkFlyout/LinkPreview.tsx → ...reateEditCustomLinkFlyout/LinkPreview.tsx
View file
Open in desktop
File renamed without changes.
0 ...stomLink/CustomLinkFlyout/LinkSection.tsx → ...reateEditCustomLinkFlyout/LinkSection.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ustomLink/CustomLinkFlyout/helper.test.ts → ...CreateEditCustomLinkFlyout/helper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import {
getSelectOptions,
replaceTemplateVariables,
} from '../CustomLinkFlyout/helper';
} from '../CreateEditCustomLinkFlyout/helper';
import { Transaction } from '../../../../../../../typings/es_schemas/ui/transaction';

describe('Custom link helper', () => {
Expand Down
0 ...eUI/CustomLink/CustomLinkFlyout/helper.ts → ...Link/CreateEditCustomLinkFlyout/helper.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...eUI/CustomLink/CustomLinkFlyout/index.tsx → ...Link/CreateEditCustomLinkFlyout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ interface Props {

const filtersEmptyState: Filter[] = [{ key: '', value: '' }];

export function CustomLinkFlyout({
export function CreateEditCustomLinkFlyout({
onClose,
onSave,
onDelete,
Expand Down
2 changes: 1 addition & 1 deletion ...nk/CustomLinkFlyout/link_preview.test.tsx → ...ditCustomLinkFlyout/link_preview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import { LinkPreview } from '../CustomLinkFlyout/LinkPreview';
import { LinkPreview } from '../CreateEditCustomLinkFlyout/LinkPreview';
import {
render,
getNodeText,
Expand Down
0 ...omLink/CustomLinkFlyout/saveCustomLink.ts → ...ateEditCustomLinkFlyout/saveCustomLink.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
expectTextsInDocument,
expectTextsNotInDocument,
} from '../../../../../utils/testHelpers';
import * as saveCustomLink from './CustomLinkFlyout/saveCustomLink';
import * as saveCustomLink from './CreateEditCustomLinkFlyout/saveCustomLink';
import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';

const data = [
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { FETCH_STATUS, useFetcher } from '../../../../../hooks/useFetcher';
import { useLicense } from '../../../../../hooks/useLicense';
import { LicensePrompt } from '../../../../shared/LicensePrompt';
import { CreateCustomLinkButton } from './CreateCustomLinkButton';
import { CustomLinkFlyout } from './CustomLinkFlyout';
import { CreateEditCustomLinkFlyout } from './CreateEditCustomLinkFlyout';
import { CustomLinkTable } from './CustomLinkTable';
import { EmptyPrompt } from './EmptyPrompt';
import { Title } from './Title';
Expand Down Expand Up @@ -61,7 +61,7 @@ export function CustomLinkOverview() {
return (
<>
{isFlyoutOpen && (
<CustomLinkFlyout
<CreateEditCustomLinkFlyout
onClose={onCloseFlyout}
defaults={customLinkSelected}
customLinkId={customLinkSelected?.id}
Expand Down
83 changes: 0 additions & 83 deletions .../apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...ugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
View file
Open in desktop

This file was deleted.

128 changes: 0 additions & 128 deletions x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.tsx
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...enu/CustomLink/CustomLinkSection.test.tsx → ...omLinkMenuSection/CustomLinkList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
*/
import React from 'react';
import { render } from '@testing-library/react';
import { CustomLinkSection } from './CustomLinkSection';
import { CustomLinkList } from './CustomLinkList';
import {
expectTextsInDocument,
expectTextsNotInDocument,
} from '../../../../utils/testHelpers';
import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
import { CustomLink } from '../../../../../common/custom_link/custom_link_types';

describe('CustomLinkSection', () => {
describe('CustomLinkList', () => {
const customLinks = [
{ id: '1', label: 'foo', url: 'http://elastic.co' },
{
Expand All @@ -27,14 +27,14 @@ describe('CustomLinkSection', () => {
} as unknown) as Transaction;
it('shows links', () => {
const component = render(
<CustomLinkSection customLinks={customLinks} transaction={transaction} />
<CustomLinkList customLinks={customLinks} transaction={transaction} />
);
expectTextsInDocument(component, ['foo', 'bar']);
});

it('doesnt show any links', () => {
const component = render(
<CustomLinkSection customLinks={[]} transaction={transaction} />
<CustomLinkList customLinks={[]} transaction={transaction} />
);
expectTextsNotInDocument(component, ['foo', 'bar']);
});
Expand Down
Loading