Fix onboarding e2e test (#183427)

Resolves #183341

## Summary

Fixes broken onboarding e2e test introduced by #182951
This commit is contained in:
Thom Heymann 2024-05-15 08:40:15 +01:00 committed by GitHub
parent 5e5d849292
commit 9d839cd45e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 46 additions and 65 deletions

View file

@ -5,8 +5,7 @@
* 2.0.
*/
// Failing: See https://github.com/elastic/kibana/issues/183341
describe.skip('[Logs onboarding] Custom logs - configure step', () => {
describe('[Logs onboarding] Custom logs - configure step', () => {
describe('logFilePaths', () => {
beforeEach(() => {
cy.loginAsViewerUser();
@ -20,7 +19,7 @@ describe.skip('[Logs onboarding] Custom logs - configure step', () => {
});
it('navigates to observability logs onboarding page', () => {
cy.getByTestSubj('observabilityOnboardingBackButtonBackButton').click();
cy.getByTestSubj('observabilityOnboardingFlowBackToSelectionButton').click();
cy.url().should('include', '/app/observabilityOnboarding');
});

View file

@ -5,8 +5,7 @@
* 2.0.
*/
// Failing: See https://github.com/elastic/kibana/issues/183341
describe.skip('[Logs onboarding] System logs', () => {
describe('[Logs onboarding] System logs', () => {
describe('System integration', () => {
beforeEach(() => {
cy.deleteIntegration('system');
@ -19,7 +18,7 @@ describe.skip('[Logs onboarding] System logs', () => {
});
it('navigates to observability logs onboarding page', () => {
cy.getByTestSubj('observabilityOnboardingBackButtonBackButton').click();
cy.getByTestSubj('observabilityOnboardingFlowBackToSelectionButton').click();
cy.url().should('include', '/app/observabilityOnboarding');
});

View file

@ -5,12 +5,11 @@
* 2.0.
*/
import { i18n } from '@kbn/i18n';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import React, { useEffect } from 'react';
import { Route, Routes } from '@kbn/shared-ux-router';
import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
import { EuiButtonEmpty, EuiPageTemplate, EuiSpacer } from '@elastic/eui';
import { useLocation } from 'react-router-dom-v5-compat';
import { EuiPageTemplate, EuiSpacer } from '@elastic/eui';
import { css } from '@emotion/react';
import backgroundImageUrl from './header/background.svg';
import { Footer } from './footer/footer';
@ -18,6 +17,7 @@ import { OnboardingFlowForm } from './onboarding_flow_form/onboarding_flow_form'
import { Header } from './header/header';
import { SystemLogsPanel } from './quickstart_flows/system_logs';
import { CustomLogsPanel } from './quickstart_flows/custom_logs';
import { BackButton } from './shared/back_button';
const queryClient = new QueryClient();
@ -68,25 +68,3 @@ export function ObservabilityOnboardingFlow() {
</QueryClientProvider>
);
}
const BackButton = () => {
const navigate = useNavigate();
const location = useLocation();
return (
<>
<EuiButtonEmpty
data-test-subj="observabilityOnboardingExperimentalOnboardingFlowBackToSelectionButton"
iconType="arrowLeft"
flush="left"
onClick={() => navigate(`../${location.search}`)}
>
{i18n.translate(
'xpack.observability_onboarding.experimentalOnboardingFlow.button.backToSelectionLabel',
{ defaultMessage: 'Back to selection' }
)}
</EuiButtonEmpty>
<EuiSpacer size="m" />
</>
);
};

View file

@ -11,16 +11,16 @@ import { i18n } from '@kbn/i18n';
import { EuiTitle, EuiSpacer } from '@elastic/eui';
import { StepModal } from '../shared/step_panel';
import { useWizard } from '.';
import { BackButton } from '../shared/back_button';
import { BackButton } from '../../shared/back_button';
export function Inspect() {
const { goBack, getState, getPath, getUsage } = useWizard();
const { getState, getPath, getUsage } = useWizard();
return (
<StepModal
title={i18n.translate('xpack.observability_onboarding.inspect.stepPanel.inspectWizardLabel', {
defaultMessage: 'Inspect wizard',
})}
panelFooter={[<BackButton onBack={goBack} />]}
panelFooter={[<BackButton />]}
>
<EuiTitle size="s">
<h3>

View file

@ -1,25 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { EuiButtonEmpty } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
export function BackButton({ onBack }: { onBack: () => void }) {
return (
<EuiButtonEmpty
data-test-subj="observabilityOnboardingBackButtonBackButton"
iconType="arrowLeft"
color="primary"
onClick={onBack}
>
{i18n.translate('xpack.observability_onboarding.steps.back', {
defaultMessage: 'Back',
})}
</EuiButtonEmpty>
);
}

View file

@ -0,0 +1,33 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { i18n } from '@kbn/i18n';
import React from 'react';
import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
export const BackButton = () => {
const navigate = useNavigate();
const location = useLocation();
return (
<>
<EuiButtonEmpty
data-test-subj="observabilityOnboardingFlowBackToSelectionButton"
iconType="arrowLeft"
flush="left"
onClick={() => navigate(`../${location.search}`)}
>
{i18n.translate(
'xpack.observability_onboarding.experimentalOnboardingFlow.button.backToSelectionLabel',
{ defaultMessage: 'Back to selection' }
)}
</EuiButtonEmpty>
<EuiSpacer size="m" />
</>
);
};

View file

@ -29898,7 +29898,6 @@
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.incompleteTitle": "Transfert des logs dans Elastic Observability",
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.loadingTitle": "En attente du transfert des logs…",
"xpack.observability_onboarding.installElasticAgent.troubleshooting": "Résolution des problèmes",
"xpack.observability_onboarding.steps.back": "Retour",
"xpack.observability_onboarding.steps.exploreLogs": "Explorer les logs",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.description": "Les intégrations rationalisent la connexion de vos donnés avec la Suite Elastic.",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.label": "Détails de l'intégration",
@ -45105,4 +45104,4 @@
"xpack.serverlessObservability.nav.projectSettings": "Paramètres de projet",
"xpack.serverlessObservability.nav.synthetics": "Synthetics"
}
}
}

View file

@ -29869,7 +29869,6 @@
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.incompleteTitle": "Elasticオブザーバビリティにログを送信",
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.loadingTitle": "ログの送信を待機中...",
"xpack.observability_onboarding.installElasticAgent.troubleshooting": "トラブルシューティング",
"xpack.observability_onboarding.steps.back": "戻る",
"xpack.observability_onboarding.steps.exploreLogs": "ログを探索",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.description": "統合により、Elastic Stackへのデータ接続が効率化されます。",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.label": "統合の詳細",
@ -45075,4 +45074,4 @@
"xpack.serverlessObservability.nav.projectSettings": "プロジェクト設定",
"xpack.serverlessObservability.nav.synthetics": "Synthetics"
}
}
}

View file

@ -29909,7 +29909,6 @@
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.incompleteTitle": "传输日志到 Elastic Observability",
"xpack.observability_onboarding.installElasticAgent.progress.logsIngest.loadingTitle": "等待传输日志......",
"xpack.observability_onboarding.installElasticAgent.troubleshooting": "故障排除",
"xpack.observability_onboarding.steps.back": "返回",
"xpack.observability_onboarding.steps.exploreLogs": "浏览日志",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.description": "集成会精简将您的数据连接到 Elastic Stack 的过程。",
"xpack.observability_onboarding.systemIntegration.installed.tooltip.label": "集成详情",
@ -45123,4 +45122,4 @@
"xpack.serverlessObservability.nav.projectSettings": "项目设置",
"xpack.serverlessObservability.nav.synthetics": "Synthetics"
}
}
}