From 3c1a3602316eee445953e9746eaca2da6e0f9c55 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 20 Aug 2021 18:37:45 -0700 Subject: [PATCH] Rename UA steps to fix_issues_step and fix_logs_step. (#109526) * Rename tests accordingly. --- .../fix_issues_step.test.tsx} | 2 +- .../mocked_responses.ts | 0 .../fix_logs_step.test.tsx} | 0 .../public/application/components/overview/_index.scss | 4 ++-- .../{review_logs_step => fix_issues_step}/_index.scss | 0 .../_stats_panel.scss | 0 .../es_stats/es_stats.tsx | 0 .../es_stats/es_stats_error.tsx | 0 .../es_stats/index.ts | 0 .../fix_issues_step.tsx} | 6 +++--- .../{review_logs_step => fix_issues_step}/index.ts | 2 +- .../kibana_stats/index.ts | 0 .../kibana_stats/kibana_stats.tsx | 0 .../no_deprecations/_no_deprecations.scss | 0 .../no_deprecations/index.ts | 0 .../no_deprecations/no_deprecations.tsx | 0 .../_index.scss | 0 .../_deprecation_logging_toggle.scss | 0 .../deprecation_logging_toggle.tsx | 0 .../deprecation_logging_toggle/index.ts | 0 .../external_links.tsx | 0 .../fix_logs_step.tsx} | 6 +++--- .../{fix_deprecation_logs_step => fix_logs_step}/index.ts | 2 +- .../use_deprecation_logging.ts | 0 .../public/application/components/overview/overview.tsx | 8 ++++---- 25 files changed, 15 insertions(+), 15 deletions(-) rename x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/{review_logs_step/review_logs_step.test.tsx => fix_issues_step/fix_issues_step.test.tsx} (99%) rename x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/{review_logs_step => fix_issues_step}/mocked_responses.ts (100%) rename x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/{fix_deprecation_logs_step/fix_deprecation_logs_step.test.tsx => fix_logs_step/fix_logs_step.test.tsx} (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/_index.scss (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/_stats_panel.scss (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/es_stats/es_stats.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/es_stats/es_stats_error.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/es_stats/index.ts (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step/review_logs_step.tsx => fix_issues_step/fix_issues_step.tsx} (88%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/index.ts (81%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/kibana_stats/index.ts (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/kibana_stats/kibana_stats.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/no_deprecations/_no_deprecations.scss (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/no_deprecations/index.ts (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{review_logs_step => fix_issues_step}/no_deprecations/no_deprecations.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/_index.scss (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/deprecation_logging_toggle/_deprecation_logging_toggle.scss (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/deprecation_logging_toggle/deprecation_logging_toggle.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/deprecation_logging_toggle/index.ts (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/external_links.tsx (100%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step/fix_deprecation_logs_step.tsx => fix_logs_step/fix_logs_step.tsx} (94%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/index.ts (77%) rename x-pack/plugins/upgrade_assistant/public/application/components/overview/{fix_deprecation_logs_step => fix_logs_step}/use_deprecation_logging.ts (100%) diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/review_logs_step/review_logs_step.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx similarity index 99% rename from x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/review_logs_step/review_logs_step.test.tsx rename to x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx index b8646540171e58..581e80e7c290a9 100644 --- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/review_logs_step/review_logs_step.test.tsx +++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx @@ -12,7 +12,7 @@ import * as mockedResponses from './mocked_responses'; import { setupEnvironment } from '../../helpers'; import { OverviewTestBed, setupOverviewPage } from '../overview.helpers'; -describe('Overview - Fix deprecated settings step', () => { +describe('Overview - Fix deprecation issues step', () => { let testBed: OverviewTestBed; const { server, httpRequestsMockHelpers } = setupEnvironment(); diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/review_logs_step/mocked_responses.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/mocked_responses.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/review_logs_step/mocked_responses.ts rename to x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/mocked_responses.ts diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_deprecation_logs_step/fix_deprecation_logs_step.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_logs_step/fix_logs_step.test.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_deprecation_logs_step/fix_deprecation_logs_step.test.tsx rename to x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_logs_step/fix_logs_step.test.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss index cbcfbff3bab68c..3febfe77b3cf79 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss @@ -1,2 +1,2 @@ -@import 'review_logs_step/index'; -@import 'fix_deprecation_logs_step/index'; +@import 'fix_issues_step/index'; +@import 'fix_logs_step/index'; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/_index.scss similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/_index.scss rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/_index.scss diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/_stats_panel.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/_stats_panel.scss similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/_stats_panel.scss rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/_stats_panel.scss diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/es_stats.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/es_stats.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/es_stats_error.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats_error.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/es_stats_error.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats_error.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/index.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/es_stats/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/es_stats/index.ts diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/review_logs_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/fix_issues_step.tsx similarity index 88% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/review_logs_step.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/fix_issues_step.tsx index 4ebde8b5f847a8..12f26a1ea34308 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/review_logs_step.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/fix_issues_step.tsx @@ -15,12 +15,12 @@ import { ESDeprecationStats } from './es_stats'; import { KibanaDeprecationStats } from './kibana_stats'; const i18nTexts = { - reviewStepTitle: i18n.translate('xpack.upgradeAssistant.overview.reviewStepTitle', { + reviewStepTitle: i18n.translate('xpack.upgradeAssistant.overview.fixIssuesStepTitle', { defaultMessage: 'Review deprecated settings and resolve issues', }), }; -export const getReviewLogsStep = ({ nextMajor }: { nextMajor: number }): EuiStepProps => { +export const getFixIssuesStep = ({ nextMajor }: { nextMajor: number }): EuiStepProps => { return { title: i18nTexts.reviewStepTitle, status: 'incomplete', @@ -29,7 +29,7 @@ export const getReviewLogsStep = ({ nextMajor }: { nextMajor: number }): EuiStep

diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/index.ts similarity index 81% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/index.ts index 231b8ba2d77746..dde6996edfc740 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/index.ts +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export { getReviewLogsStep } from './review_logs_step'; +export { getFixIssuesStep } from './fix_issues_step'; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/kibana_stats/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/kibana_stats/index.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/kibana_stats/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/kibana_stats/index.ts diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/kibana_stats/kibana_stats.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/kibana_stats/kibana_stats.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/kibana_stats/kibana_stats.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/kibana_stats/kibana_stats.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/_no_deprecations.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/_no_deprecations.scss similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/_no_deprecations.scss rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/_no_deprecations.scss diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/index.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/index.ts diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/no_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/no_deprecations.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/review_logs_step/no_deprecations/no_deprecations.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/no_deprecations/no_deprecations.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/_index.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/_index.scss similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/_index.scss rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/_index.scss diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/_deprecation_logging_toggle.scss b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/_deprecation_logging_toggle.scss similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/_deprecation_logging_toggle.scss rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/_deprecation_logging_toggle.scss diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/deprecation_logging_toggle.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/deprecation_logging_toggle.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/deprecation_logging_toggle.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/deprecation_logging_toggle.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/index.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/deprecation_logging_toggle/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/deprecation_logging_toggle/index.ts diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/external_links.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/external_links.tsx similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/external_links.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/external_links.tsx diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/fix_deprecation_logs_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/fix_logs_step.tsx similarity index 94% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/fix_deprecation_logs_step.tsx rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/fix_logs_step.tsx index a2f1feae4979d1..9c22a07ed771bf 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/fix_deprecation_logs_step.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/fix_logs_step.tsx @@ -40,7 +40,7 @@ const i18nTexts = { ), }; -const DeprecationLogsPreview: FunctionComponent = () => { +const FixLogsStep: FunctionComponent = () => { const state = useDeprecationLogging(); return ( @@ -81,10 +81,10 @@ const DeprecationLogsPreview: FunctionComponent = () => { ); }; -export const getFixDeprecationLogsStep = (): EuiStepProps => { +export const getFixLogsStep = (): EuiStepProps => { return { title: i18nTexts.identifyStepTitle, status: 'incomplete', - children: , + children: , }; }; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/index.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/index.ts similarity index 77% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/index.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/index.ts index d4794623d8a991..8a9a9faa6d0984 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/index.ts +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export { getFixDeprecationLogsStep } from './fix_deprecation_logs_step'; +export { getFixLogsStep } from './fix_logs_step'; diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/use_deprecation_logging.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/use_deprecation_logging.ts similarity index 100% rename from x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_deprecation_logs_step/use_deprecation_logging.ts rename to x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_logs_step/use_deprecation_logging.ts diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx index f900416873b830..3f6bf25e9abf00 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx @@ -21,8 +21,8 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { useAppContext } from '../../app_context'; -import { getReviewLogsStep } from './review_logs_step'; -import { getFixDeprecationLogsStep } from './fix_deprecation_logs_step'; +import { getFixIssuesStep } from './fix_issues_step'; +import { getFixLogsStep } from './fix_logs_step'; import { getUpgradeStep } from './upgrade_step'; export const Overview: FunctionComponent = () => { @@ -83,8 +83,8 @@ export const Overview: FunctionComponent = () => {