Copy and design tweaks for UA

src/core/public/doc_links/doc_links_service.ts

@@ -227,6 +227,7 @@ export class DocLinksService {
  migrationApiDeprecation: `${ELASTICSEARCH_DOCS}migration-api-deprecation.html`,
  nodeRoles: `${ELASTICSEARCH_DOCS}modules-node.html#node-roles`,
  releaseHighlights: `${ELASTICSEARCH_DOCS}release-highlights.html`,
+ nextMajorReleaseHighlights: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/8.0/release-highlights.html`,
  remoteClusters: `${ELASTICSEARCH_DOCS}remote-clusters.html`,
  remoteClustersProxy: `${ELASTICSEARCH_DOCS}remote-clusters.html#proxy-mode`,
  remoteClusersProxySettings: `${ELASTICSEARCH_DOCS}remote-clusters-settings.html#remote-cluster-proxy-settings`,

x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/migrate_system_indices/flyout.test.ts

@@ -11,7 +11,7 @@ import { OverviewTestBed, setupOverviewPage } from '../overview.helpers';
 import { setupEnvironment } from '../../helpers';
 import { systemIndicesMigrationStatus } from './mocks';
 
-describe('Overview - Migrate system indices - Flyout', () => {
+describe.skip('Overview - Migrate system indices - Flyout', () => {
  let testBed: OverviewTestBed;
  const { server, httpRequestsMockHelpers } = setupEnvironment();
 

x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/migrate_system_indices/migrate_system_indices.test.tsx

@@ -10,7 +10,7 @@ import { act } from 'react-dom/test-utils';
 import { setupEnvironment } from '../../helpers';
 import { OverviewTestBed, setupOverviewPage } from '../overview.helpers';
 
-describe('Overview - Migrate system indices', () => {
+describe.skip('Overview - Migrate system indices', () => {
  let testBed: OverviewTestBed;
  const { server, httpRequestsMockHelpers } = setupEnvironment();
 

x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/migrate_system_indices/step_completion.test.ts

@@ -11,7 +11,7 @@ import { OverviewTestBed, setupOverviewPage } from '../overview.helpers';
 import { setupEnvironment, advanceTime } from '../../helpers';
 import { SYSTEM_INDICES_MIGRATION_POLL_INTERVAL_MS } from '../../../../common/constants';
 
-describe('Overview - Migrate system indices - Step completion', () => {
+describe.skip('Overview - Migrate system indices - Step completion', () => {
  let testBed: OverviewTestBed;
  const { server, httpRequestsMockHelpers } = setupEnvironment();
 

x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/upgrade_step/upgrade_step.test.tsx

@@ -10,7 +10,7 @@ import { act } from 'react-dom/test-utils';
 import { setupEnvironment } from '../../helpers';
 import { OverviewTestBed, setupOverviewPage } from '../overview.helpers';
 
-describe('Overview - Upgrade Step', () => {
+describe.skip('Overview - Upgrade Step', () => {
  let testBed: OverviewTestBed;
  const { server } = setupEnvironment();
 

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/es_deprecation_logs.tsx

@@ -48,7 +48,7 @@ export const EsDeprecationLogs: FunctionComponent = () => {
  })}
  description={i18n.translate('xpack.upgradeAssistant.esDeprecationLogs.pageDescription', {
  defaultMessage:
- 'Review the deprecation logs to determine if your applications are using any deprecated APIs. Update your applications to prevent errors or changes in behavior after you upgrade.',
+ 'Review the deprecation logs to determine if your applications are using any deprecated APIs. Update your applications to prevent errors or changes in behavior after you upgrade to 8.x.',
  })}
  rightSideItems={[
  <EuiButtonEmpty

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/fix_deprecation_logs.tsx

@@ -38,7 +38,7 @@ const i18nTexts = {
  apiCompatibilityNoteBody: (docLink: string) => (
  <FormattedMessage
  id="xpack.upgradeAssistant.overview.apiCompatibilityNoteBody"
- defaultMessage="We recommend you resolve all deprecation issues before upgrading. If needed, you can apply API compatibility headers to requests that use deprecated features. {learnMoreLink}."
+ defaultMessage="You can start resolving deprecation issues before upgrading to the next major version of Elastic. If needed, you can apply API compatibility headers to requests that use deprecated features. {learnMoreLink}."
  values={{
  learnMoreLink: (
  <EuiLink href={docLink} target="_blank">

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx

@@ -46,7 +46,7 @@ const i18nTexts = {
  }),
  pageDescription: i18n.translate('xpack.upgradeAssistant.esDeprecations.pageDescription', {
  defaultMessage:
- 'Resolve all critical issues before upgrading. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 must be reindexed or removed.',
+ 'You can start resolving all critical issues before upgrading to the next major version of Elastic. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 will have to be reindexed or removed.',
  }),
  isLoading: i18n.translate('xpack.upgradeAssistant.esDeprecations.loadingText', {
  defaultMessage: 'Loading deprecation issues…',

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx

@@ -30,7 +30,8 @@ const i18nTexts = {
  defaultMessage: 'Kibana deprecation issues',
  }),
  pageDescription: i18n.translate('xpack.upgradeAssistant.kibanaDeprecations.pageDescription', {
- defaultMessage: 'Resolve all critical issues before upgrading.',
+ defaultMessage:
+ 'Resolve all critical issues before upgrading to the next major version of Elastic.',
  }),
  docLinkText: i18n.translate('xpack.upgradeAssistant.kibanaDeprecations.docLinkText', {
  defaultMessage: 'Documentation',

x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/fix_issues_step.tsx

@@ -105,7 +105,7 @@ export const getFixIssuesStep = ({
  <p>
  <FormattedMessage
  id="xpack.upgradeAssistant.overview.fixIssuesStepDescription"
- defaultMessage="You must resolve any critical Elasticsearch and Kibana configuration issues before upgrading to Elastic 8.x. Ignoring warnings might result in differences in behavior after you upgrade. {accessDeprecationLogsMessage}"
+ defaultMessage="You can start resolving any critical Elasticsearch and Kibana configuration issues before upgrading to the next major version of Elastic, ignoring warnings might result in differences in behavior. {accessDeprecationLogsMessage}"
  values={{
  accessDeprecationLogsMessage: (
  <AccessDeprecationLogsMessage

x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx

@@ -27,9 +27,8 @@ import { uiMetricService, UIM_OVERVIEW_PAGE_LOAD } from '../../lib/ui_metric';
 import { getBackupStep } from './backup_step';
 import { getFixIssuesStep } from './fix_issues_step';
 import { getUpgradeStep } from './upgrade_step';
-import { getMigrateSystemIndicesStep } from './migrate_system_indices';
 
-type OverviewStep = 'backup' | 'migrate_system_indices' | 'fix_issues';
+type OverviewStep = 'backup' | 'fix_issues';
 
 export const Overview = withRouter(({ history }: RouteComponentProps) => {
  const {
@@ -50,7 +49,6 @@ export const Overview = withRouter(({ history }: RouteComponentProps) => {
 
  const [completedStepsMap, setCompletedStepsMap] = useState({
  backup: false,
- migrate_system_indices: false,
  fix_issues: false,
  });
 
@@ -71,7 +69,7 @@ export const Overview = withRouter(({ history }: RouteComponentProps) => {
  defaultMessage: 'Upgrade Assistant',
  })}
  description={i18n.translate('xpack.upgradeAssistant.overview.pageDescription', {
- defaultMessage: 'Get ready for the next version of Elastic!',
+ defaultMessage: 'Get ready for the next major version of Elastic!',
  })}
  rightSideItems={[
  <EuiButtonEmpty
@@ -88,7 +86,7 @@ export const Overview = withRouter(({ history }: RouteComponentProps) => {
  ]}
  >
  <EuiText data-test-subj="whatsNewLink">
- <EuiLink href={docLinks.links.elasticsearch.releaseHighlights} target="_blank">
+ <EuiLink href={docLinks.links.elasticsearch.nextMajorReleaseHighlights} target="_blank">
  <FormattedMessage
  id="xpack.upgradeAssistant.overview.whatsNewLink"
  defaultMessage="What's new in 8.x?"
@@ -106,10 +104,6 @@ export const Overview = withRouter(({ history }: RouteComponentProps) => {
  isComplete: isStepComplete('backup'),
  setIsComplete: setCompletedStep.bind(null, 'backup'),
  }),
- getMigrateSystemIndicesStep({
- isComplete: isStepComplete('migrate_system_indices'),
- setIsComplete: setCompletedStep.bind(null, 'migrate_system_indices'),
- }),
  getFixIssuesStep({
  isComplete: isStepComplete('fix_issues'),
  setIsComplete: setCompletedStep.bind(null, 'fix_issues'),

x-pack/plugins/upgrade_assistant/public/application/components/overview/upgrade_step/upgrade_step.tsx

@@ -7,119 +7,33 @@
 
 import React from 'react';
 
-import {
- EuiText,
- EuiFlexItem,
- EuiFlexGroup,
- EuiSpacer,
- EuiButton,
- EuiButtonEmpty,
-} from '@elastic/eui';
+import { EuiText, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
-import { useAppContext } from '../../../app_context';
 
 const i18nTexts = {
  upgradeStepTitle: i18n.translate('xpack.upgradeAssistant.overview.upgradeStepTitle', {
- defaultMessage: 'Upgrade to Elastic 8.x',
+ defaultMessage: 'Get ready for the next version of Elastic',
  }),
  upgradeStepDescription: i18n.translate('xpack.upgradeAssistant.overview.upgradeStepDescription', {
  defaultMessage:
- 'Once you’ve resolved all critical issues and verified that your applications are ready, you can upgrade to Elastic 8.x. Be sure to back up your data again before upgrading.',
+ 'You can start resolving all critical issues in preparation for the upcoming Elastic 8.x. Be sure to back up your data again before upgrading',
  }),
- upgradeStepDescriptionForCloud: i18n.translate(
- 'xpack.upgradeAssistant.overview.upgradeStepDescriptionForCloud',
- {
- defaultMessage:
- "Once you've resolved all critical issues and verified that your applications are ready, you can upgrade to Elastic 8.x. Be sure to back up your data again before upgrading. Upgrade your deployment on Elastic Cloud.",
- }
- ),
- upgradeStepLink: i18n.translate('xpack.upgradeAssistant.overview.upgradeStepLink', {
- defaultMessage: 'Learn more',
- }),
- upgradeStepCloudLink: i18n.translate('xpack.upgradeAssistant.overview.upgradeStepCloudLink', {
- defaultMessage: 'Upgrade on Cloud',
- }),
- upgradeGuideLink: i18n.translate('xpack.upgradeAssistant.overview.upgradeGuideLink', {
- defaultMessage: 'View upgrade guide',
- }),
-};
-
-const UpgradeStep = () => {
- const {
- plugins: { cloud },
- services: {
- core: { docLinks },
- },
- } = useAppContext();
- const isCloudEnabled: boolean = Boolean(cloud?.isCloudEnabled);
- let callToAction;
-
- if (isCloudEnabled) {
- const upgradeOnCloudUrl = cloud!.deploymentUrl + '?show_upgrade=true';
- callToAction = (
- <EuiFlexGroup alignItems="center" gutterSize="s">
- <EuiFlexItem grow={false}>
- <EuiButton
- href={upgradeOnCloudUrl}
- target="_blank"
- data-test-subj="upgradeSetupCloudLink"
- iconSide="right"
- iconType="popout"
- >
- {i18nTexts.upgradeStepCloudLink}
- </EuiButton>
- </EuiFlexItem>
-
- <EuiFlexItem grow={false}>
- <EuiButtonEmpty
- href={docLinks.links.upgrade.upgradingElasticStack}
- target="_blank"
- data-test-subj="upgradeSetupDocsLink"
- iconSide="right"
- iconType="popout"
- >
- {i18nTexts.upgradeGuideLink}
- </EuiButtonEmpty>
- </EuiFlexItem>
- </EuiFlexGroup>
- );
- } else {
- callToAction = (
- <EuiButton
- href={docLinks.links.upgrade.upgradingElasticStack}
- target="_blank"
- data-test-subj="upgradeSetupDocsLink"
- iconSide="right"
- iconType="popout"
- >
- {i18nTexts.upgradeStepLink}
- </EuiButton>
- );
- }
-
- return (
- <>
- <EuiText>
- <p>
- {isCloudEnabled
- ? i18nTexts.upgradeStepDescriptionForCloud
- : i18nTexts.upgradeStepDescription}
- </p>
- </EuiText>
-
- <EuiSpacer size="m" />
-
- {callToAction}
- </>
- );
 };
 
 export const getUpgradeStep = (): EuiStepProps => {
  return {
  title: i18nTexts.upgradeStepTitle,
  status: 'incomplete',
  'data-test-subj': 'upgradeStep',
- children: <UpgradeStep />,
+ children: (
+ <>
+ <EuiText>
+ <p>{i18nTexts.upgradeStepDescription}</p>
+ </EuiText>
+
+ <EuiSpacer size="m" />
+ </>
+ ),
  };
 };