Skip to content
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

Rename UA steps to fix_issues_step and fix_logs_step. #109526

Merged
merged 3 commits into from
Aug 21, 2021
Merged

Rename UA steps to fix_issues_step and fix_logs_step. #109526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd21041
Rename steps to fix_issues_step and fix_logs_step.
cjcenizal Aug 20, 2021
fa4a576
Rename tests accordingly.
cjcenizal Aug 20, 2021
bbca303
Merge branch '7.x' into ua/7.x/rename-deprecation-issues-step
kibanamachine Aug 20, 2021
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 ...eview_logs_step/review_logs_step.test.tsx → .../fix_issues_step/fix_issues_step.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
0 ...view/review_logs_step/mocked_responses.ts → ...rview/fix_issues_step/mocked_responses.ts
View file
Open in desktop
File renamed without changes.
0 ...s_step/fix_deprecation_logs_step.test.tsx → ...view/fix_logs_step/fix_logs_step.test.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions x-pack/plugins/upgrade_assistant/public/application/components/overview/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
0 ...nts/overview/review_logs_step/_index.scss → ...ents/overview/fix_issues_step/_index.scss
View file
Open in desktop
File renamed without changes.
0 ...erview/review_logs_step/_stats_panel.scss → ...verview/fix_issues_step/_stats_panel.scss
View file
Open in desktop
File renamed without changes.
0 ...ew/review_logs_step/es_stats/es_stats.tsx → ...iew/fix_issues_step/es_stats/es_stats.tsx
View file
Open in desktop
File renamed without changes.
0 ...iew_logs_step/es_stats/es_stats_error.tsx → ...x_issues_step/es_stats/es_stats_error.tsx
View file
Open in desktop
File renamed without changes.
0 ...erview/review_logs_step/es_stats/index.ts → ...verview/fix_issues_step/es_stats/index.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...iew/review_logs_step/review_logs_step.tsx → ...rview/fix_issues_step/fix_issues_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -29,7 +29,7 @@ export const getReviewLogsStep = ({ nextMajor }: { nextMajor: number }): EuiStep
<EuiText>
<p>
<FormattedMessage
id="xpack.upgradeAssistant.overview.resolveStepDescription"
id="xpack.upgradeAssistant.overview.fixIssuesStepDescription"
defaultMessage="Update your Elasticsearch and Kibana deployments to be compatible with {nextMajor}.0. Critical issues must be resolved before you upgrade."
values={{ nextMajor }}
/>
Expand Down
2 changes: 1 addition & 1 deletion ...onents/overview/review_logs_step/index.ts → ...ponents/overview/fix_issues_step/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
* 2.0.
*/

export { getReviewLogsStep } from './review_logs_step';
export { getFixIssuesStep } from './fix_issues_step';
0 ...ew/review_logs_step/kibana_stats/index.ts → ...iew/fix_issues_step/kibana_stats/index.ts
View file
Open in desktop
File renamed without changes.
0 ...w_logs_step/kibana_stats/kibana_stats.tsx → ...issues_step/kibana_stats/kibana_stats.tsx
View file
Open in desktop
File renamed without changes.
0 ...tep/no_deprecations/_no_deprecations.scss → ...tep/no_deprecations/_no_deprecations.scss
View file
Open in desktop
File renamed without changes.
0 ...review_logs_step/no_deprecations/index.ts → .../fix_issues_step/no_deprecations/index.ts
View file
Open in desktop
File renamed without changes.
0 ..._step/no_deprecations/no_deprecations.tsx → ..._step/no_deprecations/no_deprecations.tsx
View file
Open in desktop
File renamed without changes.
0 ...iew/fix_deprecation_logs_step/_index.scss → ...onents/overview/fix_logs_step/_index.scss
View file
Open in desktop
File renamed without changes.
0 ...g_toggle/_deprecation_logging_toggle.scss → ...g_toggle/_deprecation_logging_toggle.scss
View file
Open in desktop
File renamed without changes.
0 ...ing_toggle/deprecation_logging_toggle.tsx → ...ing_toggle/deprecation_logging_toggle.tsx
View file
Open in desktop
File renamed without changes.
0 ..._step/deprecation_logging_toggle/index.ts → ..._step/deprecation_logging_toggle/index.ts
View file
Open in desktop
File renamed without changes.
0 ..._deprecation_logs_step/external_links.tsx → ...overview/fix_logs_step/external_links.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...n_logs_step/fix_deprecation_logs_step.tsx → .../overview/fix_logs_step/fix_logs_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const i18nTexts = {
),
};

const DeprecationLogsPreview: FunctionComponent = () => {
const FixLogsStep: FunctionComponent = () => {
const state = useDeprecationLogging();

return (
Expand Down Expand Up @@ -81,10 +81,10 @@ const DeprecationLogsPreview: FunctionComponent = () => {
);
};

export const getFixDeprecationLogsStep = (): EuiStepProps => {
export const getFixLogsStep = (): EuiStepProps => {
return {
title: i18nTexts.identifyStepTitle,
status: 'incomplete',
children: <DeprecationLogsPreview />,
children: <FixLogsStep />,
};
};
2 changes: 1 addition & 1 deletion ...erview/fix_deprecation_logs_step/index.ts → ...omponents/overview/fix_logs_step/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
* 2.0.
*/

export { getFixDeprecationLogsStep } from './fix_deprecation_logs_step';
export { getFixLogsStep } from './fix_logs_step';
0 ...tion_logs_step/use_deprecation_logging.ts → .../fix_logs_step/use_deprecation_logging.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions x-pack/plugins/upgrade_assistant/public/application/components/overview/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -83,8 +83,8 @@ export const Overview: FunctionComponent = () => {

<EuiSteps
steps={[
getReviewLogsStep({ nextMajor }),
getFixDeprecationLogsStep(),
getFixIssuesStep({ nextMajor }),
getFixLogsStep(),
getUpgradeStep({ docLinks, nextMajor }),
]}
/>
Expand Down