[7.x] [APM] Only fetch custom links for users with a valid license (e…

…lastic#83836) (elastic#83995)
patrykkopycinski · Nov 21, 2020 · 4b49eeb · 4b49eeb
1 parent c952cf9
commit 4b49eeb
Show file tree

Hide file tree

Showing 29 changed files with 416 additions and 567 deletions.
diff --git a/x-pack/plugins/apm/jest.config.js b/x-pack/plugins/apm/jest.config.js
@@ -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/**',

diff --git a/...tomLink/CustomLinkFlyout/DeleteButton.tsx → ...eateEditCustomLinkFlyout/DeleteButton.tsx b/...tomLink/CustomLinkFlyout/DeleteButton.tsx → ...eateEditCustomLinkFlyout/DeleteButton.tsx
diff --git a/...omLink/CustomLinkFlyout/Documentation.tsx → ...ateEditCustomLinkFlyout/Documentation.tsx b/...omLink/CustomLinkFlyout/Documentation.tsx → ...ateEditCustomLinkFlyout/Documentation.tsx
diff --git a/...mLink/CustomLinkFlyout/FiltersSection.tsx → ...teEditCustomLinkFlyout/FiltersSection.tsx b/...mLink/CustomLinkFlyout/FiltersSection.tsx → ...teEditCustomLinkFlyout/FiltersSection.tsx
diff --git a/...tomLink/CustomLinkFlyout/FlyoutFooter.tsx → ...eateEditCustomLinkFlyout/FlyoutFooter.tsx b/...tomLink/CustomLinkFlyout/FlyoutFooter.tsx → ...eateEditCustomLinkFlyout/FlyoutFooter.tsx
diff --git a/...stomLink/CustomLinkFlyout/LinkPreview.tsx → ...reateEditCustomLinkFlyout/LinkPreview.tsx b/...stomLink/CustomLinkFlyout/LinkPreview.tsx → ...reateEditCustomLinkFlyout/LinkPreview.tsx
diff --git a/...stomLink/CustomLinkFlyout/LinkSection.tsx → ...reateEditCustomLinkFlyout/LinkSection.tsx b/...stomLink/CustomLinkFlyout/LinkSection.tsx → ...reateEditCustomLinkFlyout/LinkSection.tsx
diff --git a/...ustomLink/CustomLinkFlyout/helper.test.ts → ...CreateEditCustomLinkFlyout/helper.test.ts b/...ustomLink/CustomLinkFlyout/helper.test.ts → ...CreateEditCustomLinkFlyout/helper.test.ts
@@ -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', () => {

diff --git a/...eUI/CustomLink/CustomLinkFlyout/helper.ts → ...Link/CreateEditCustomLinkFlyout/helper.ts b/...eUI/CustomLink/CustomLinkFlyout/helper.ts → ...Link/CreateEditCustomLinkFlyout/helper.ts
diff --git a/...eUI/CustomLink/CustomLinkFlyout/index.tsx → ...Link/CreateEditCustomLinkFlyout/index.tsx b/...eUI/CustomLink/CustomLinkFlyout/index.tsx → ...Link/CreateEditCustomLinkFlyout/index.tsx
@@ -37,7 +37,7 @@ interface Props {
 
 const filtersEmptyState: Filter[] = [{ key: '', value: '' }];
 
-export function CustomLinkFlyout({
+export function CreateEditCustomLinkFlyout({
   onClose,
   onSave,
   onDelete,

diff --git a/...nk/CustomLinkFlyout/link_preview.test.tsx → ...ditCustomLinkFlyout/link_preview.test.tsx b/...nk/CustomLinkFlyout/link_preview.test.tsx → ...ditCustomLinkFlyout/link_preview.test.tsx
@@ -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,

diff --git a/...omLink/CustomLinkFlyout/saveCustomLink.ts → ...ateEditCustomLinkFlyout/saveCustomLink.ts b/...omLink/CustomLinkFlyout/saveCustomLink.ts → ...ateEditCustomLinkFlyout/saveCustomLink.ts
diff --git a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/Title.tsx
diff --git a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.test.tsx
@@ -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 = [

diff --git a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
@@ -9,6 +9,7 @@ import {
   EuiFlexItem,
   EuiPanel,
   EuiSpacer,
+  EuiTitle,
   EuiText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -20,10 +21,9 @@ 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';
 
 export function CustomLinkOverview() {
   const license = useLicense();
@@ -35,9 +35,14 @@ export function CustomLinkOverview() {
   >();
 
   const { data: customLinks = [], status, refetch } = useFetcher(
-    (callApmApi) =>
-      callApmApi({ endpoint: 'GET /api/apm/settings/custom_links' }),
-    []
+    async (callApmApi) => {
+      if (hasValidLicense) {
+        return callApmApi({
+          endpoint: 'GET /api/apm/settings/custom_links',
+        });
+      }
+    },
+    [hasValidLicense]
   );
 
   useEffect(() => {
@@ -61,7 +66,7 @@ export function CustomLinkOverview() {
   return (
     <>
       {isFlyoutOpen && (
-        <CustomLinkFlyout
+        <CreateEditCustomLinkFlyout
           onClose={onCloseFlyout}
           defaults={customLinkSelected}
           customLinkId={customLinkSelected?.id}
@@ -78,7 +83,28 @@ export function CustomLinkOverview() {
       <EuiPanel>
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem grow={false}>
-            <Title />
+            <EuiFlexGroup alignItems="center">
+              <EuiFlexItem grow={false}>
+                <EuiTitle>
+                  <EuiFlexGroup
+                    alignItems="center"
+                    gutterSize="s"
+                    responsive={false}
+                  >
+                    <EuiFlexItem grow={false}>
+                      <h2>
+                        {i18n.translate(
+                          'xpack.apm.settings.customizeUI.customLink',
+                          {
+                            defaultMessage: 'Custom Links',
+                          }
+                        )}
+                      </h2>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </EuiTitle>
+              </EuiFlexItem>
+            </EuiFlexGroup>
           </EuiFlexItem>
           {hasValidLicense && !showEmptyPrompt && (
             <EuiFlexItem>

diff --git a/.../apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx b/.../apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
diff --git a/...ugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx b/...ugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.tsx
diff --git a/...ugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx b/...ugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkSection.tsx