From a41cee1b3422b91eb1e1ef0c6622b33ea6c44d6c Mon Sep 17 00:00:00 2001 From: Scotty Bollinger Date: Fri, 15 Oct 2021 08:22:52 -0500 Subject: [PATCH] [Workplace Search] Update copy and move links inline for Sync Scheduling (#115081) --- .../components/synchronization/frequency.tsx | 22 +++++++-------- .../synchronization/objects_and_assets.tsx | 14 ++++++---- .../synchronization/synchronization.test.tsx | 3 +-- .../synchronization/synchronization.tsx | 14 ++++++---- .../views/content_sources/constants.ts | 27 +++---------------- 5 files changed, 31 insertions(+), 49 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/frequency.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/frequency.tsx index a682e10269e6c..db4f80dc37f4b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/frequency.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/frequency.tsx @@ -26,10 +26,10 @@ import { ViewContentHeader } from '../../../../components/shared/view_content_he import { NAV, RESET_BUTTON } from '../../../../constants'; import { DIFFERENT_SYNC_TYPES_DOCS_URL } from '../../../../routes'; import { + LEARN_MORE_LINK, SOURCE_FREQUENCY_DESCRIPTION, SOURCE_SYNC_FREQUENCY_TITLE, BLOCKED_TIME_WINDOWS_TITLE, - SYNC_FREQUENCY_LINK_LABEL, SYNC_UNSAVED_CHANGES_MESSAGE, } from '../../constants'; import { SourceLogic } from '../../source_logic'; @@ -84,16 +84,6 @@ export const Frequency: React.FC = ({ tabId }) => { ); - const docsLinks = ( - - - - {SYNC_FREQUENCY_LINK_LABEL} - - - - ); - return ( = ({ tabId }) => { /> + {SOURCE_FREQUENCY_DESCRIPTION}{' '} + + {LEARN_MORE_LINK} + + + } action={actions} /> - {docsLinks} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/objects_and_assets.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/objects_and_assets.tsx index 54ce0563ddeb3..2dfa2a6420f7f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/objects_and_assets.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/objects_and_assets.tsx @@ -27,11 +27,11 @@ import { ViewContentHeader } from '../../../../components/shared/view_content_he import { NAV, RESET_BUTTON } from '../../../../constants'; import { OBJECTS_AND_ASSETS_DOCS_URL } from '../../../../routes'; import { + LEARN_MORE_LINK, SYNC_MANAGEMENT_CONTENT_EXTRACTION_LABEL, SYNC_MANAGEMENT_THUMBNAILS_LABEL, SYNC_MANAGEMENT_THUMBNAILS_GLOBAL_CONFIG_LABEL, SOURCE_OBJECTS_AND_ASSETS_DESCRIPTION, - OBJECTS_AND_ASSETS_LINK_LABEL, SOURCE_OBJECTS_AND_ASSETS_LABEL, SYNC_UNSAVED_CHANGES_MESSAGE, } from '../../constants'; @@ -84,12 +84,16 @@ export const ObjectsAndAssets: React.FC = () => { /> + {SOURCE_OBJECTS_AND_ASSETS_DESCRIPTION}{' '} + + {LEARN_MORE_LINK} + + + } action={actions} /> - - {OBJECTS_AND_ASSETS_LINK_LABEL} - {SOURCE_OBJECTS_AND_ASSETS_LABEL} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.test.tsx index fb9cdc6916fa9..2d1e8105c12b2 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.test.tsx @@ -12,7 +12,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { EuiLink, EuiCallOut, EuiSwitch } from '@elastic/eui'; +import { EuiCallOut, EuiSwitch } from '@elastic/eui'; import { Synchronization } from './synchronization'; @@ -28,7 +28,6 @@ describe('Synchronization', () => { it('renders when config enabled', () => { const wrapper = shallow(); - expect(wrapper.find(EuiLink)).toHaveLength(1); expect(wrapper.find(EuiSwitch)).toHaveLength(1); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.tsx index e88d4d251fa54..dec275adb3c50 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/synchronization.tsx @@ -15,12 +15,12 @@ import { ViewContentHeader } from '../../../../components/shared/view_content_he import { NAV } from '../../../../constants'; import { SYNCHRONIZATION_DOCS_URL } from '../../../../routes'; import { + LEARN_MORE_LINK, SOURCE_SYNCHRONIZATION_DESCRIPTION, SYNCHRONIZATION_DISABLED_TITLE, SYNCHRONIZATION_DISABLED_DESCRIPTION, SOURCE_SYNCHRONIZATION_TOGGLE_LABEL, SOURCE_SYNCHRONIZATION_TOGGLE_DESCRIPTION, - SYNCHRONIZATION_LINK_LABEL, } from '../../constants'; import { SourceLogic } from '../../source_logic'; import { SourceLayout } from '../source_layout'; @@ -65,11 +65,15 @@ export const Synchronization: React.FC = () => { > + {SOURCE_SYNCHRONIZATION_DESCRIPTION}{' '} + + {LEARN_MORE_LINK} + + + } /> - - {SYNCHRONIZATION_LINK_LABEL} - {isSyncConfigEnabled ? syncToggle : syncDisabledCallout} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts index f44dbae0608ea..087716e565ad0 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/constants.ts @@ -531,7 +531,7 @@ export const SOURCE_SYNCHRONIZATION_DESCRIPTION = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.sources.sourceSynchronizationDescription', { defaultMessage: - 'Synchronization provides control over data being indexed from the content source. Enable synchronization of data from the content source to Workplace Search.', + 'Enable or disable synchronization of data from this content source to Workplace Search.', } ); @@ -539,7 +539,7 @@ export const SOURCE_FREQUENCY_DESCRIPTION = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.sources.sourceFrequencyDescription', { defaultMessage: - 'Schedule the frequency of data synchronization between Workplace search and the content source. Indexing schedules that occur less frequently lower the burden on third-party servers, while more frequent will ensure your data is up-to-date.', + 'Manage the frequency of data synchronization from Workplace search to this content source. Sync more frequently to ensure your data is up to date. Sync less frequently to reduce the burden on third party servers.', } ); @@ -547,7 +547,7 @@ export const SOURCE_OBJECTS_AND_ASSETS_DESCRIPTION = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.sources.sourceObjectsAndAssetsDescription', { defaultMessage: - 'Customize the indexing rules that determine what data is synchronized from this content source to Workplace Search.', + 'Customize the indexing rules that determine which objects and assets are synchronized from this content source to Workplace Search.', } ); @@ -636,13 +636,6 @@ export const BLOCKED_TIME_WINDOWS_TITLE = i18n.translate( } ); -export const SYNCHRONIZATION_LINK_LABEL = i18n.translate( - 'xpack.enterpriseSearch.workplaceSearch.sources.synchronizationLinkLabel', - { - defaultMessage: 'Learn more about synchronization', - } -); - export const SYNCHRONIZATION_DISABLED_TITLE = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.sources.synchronizationDisabledTitle', { @@ -657,20 +650,6 @@ export const SYNCHRONIZATION_DISABLED_DESCRIPTION = i18n.translate( } ); -export const SYNC_FREQUENCY_LINK_LABEL = i18n.translate( - 'xpack.enterpriseSearch.workplaceSearch.sources.syncFrequencyLinkLabel', - { - defaultMessage: 'Learn more about synchronization frequency', - } -); - -export const OBJECTS_AND_ASSETS_LINK_LABEL = i18n.translate( - 'xpack.enterpriseSearch.workplaceSearch.sources.objectsAndAssetsLinkLabel', - { - defaultMessage: 'Learn more about Objects and assets', - } -); - export const FULL_SYNC_LABEL = i18n.translate( 'xpack.enterpriseSearch.workplaceSearch.sources.fullSyncLabel', {