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.

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

Add "Back up data" step to UA #109543

Merged
merged 13 commits into from
Aug 24, 2021
Merged
2 changes: 1 addition & 1 deletion x-pack/plugins/snapshot_restore/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "Stack Management",
"githubTeam": "kibana-stack-management"
},
"requiredPlugins": ["licensing", "management", "features"],
"requiredPlugins": ["licensing", "management", "features", "share"],
"optionalPlugins": ["usageCollection", "security", "cloud", "home"],
"configPath": ["xpack", "snapshot_restore"],
"requiredBundles": ["esUiShared", "kibanaReact", "home"]
Expand Down
45 changes: 45 additions & 0 deletions x-pack/plugins/snapshot_restore/public/locator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* 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 type { SerializableRecord } from '@kbn/utility-types';
import { ManagementAppLocator } from 'src/plugins/management/common';
import { LocatorDefinition } from '../../../../src/plugins/share/public/';
import { linkToSnapshots } from './application/services/navigation';
import { PLUGIN } from '../common/constants';

export const SNAPSHOT_RESTORE_LOCATOR_ID = 'SNAPSHOT_RESTORE_LOCATOR';

export interface SnapshotRestoreLocatorParams extends SerializableRecord {
page: 'snapshots';
}

export interface SnapshotRestoreLocatorDefinitionDependencies {
managementAppLocator: ManagementAppLocator;
}

export class SnapshotRestoreLocatorDefinition
implements LocatorDefinition<SnapshotRestoreLocatorParams> {
constructor(protected readonly deps: SnapshotRestoreLocatorDefinitionDependencies) {}

public readonly id = SNAPSHOT_RESTORE_LOCATOR_ID;

public readonly getLocation = async (params: SnapshotRestoreLocatorParams) => {
const location = await this.deps.managementAppLocator.getLocation({
sectionId: 'data',
appId: PLUGIN.id,
});

switch (params.page) {
case 'snapshots': {
return {
...location,
path: location.path + linkToSnapshots(),
};
}
}
};
}
15 changes: 12 additions & 3 deletions x-pack/plugins/snapshot_restore/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

import { i18n } from '@kbn/i18n';
import { CoreSetup, PluginInitializerContext } from 'src/core/public';

import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
import { ManagementSetup } from '../../../../src/plugins/management/public';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
import { ManagementSetup } from 'src/plugins/management/public';
import { SharePluginSetup } from 'src/plugins/share/public';
import {
FeatureCatalogueCategory,
HomePublicPluginSetup,
} from '../../../../src/plugins/home/public';

import { PLUGIN } from '../common/constants';

import { ClientConfigType } from './types';
Expand All @@ -22,10 +23,12 @@ import { httpService, setUiMetricService } from './application/services/http';
import { textService } from './application/services/text';
import { UiMetricService } from './application/services';
import { UIM_APP_NAME } from './application/constants';
import { SnapshotRestoreLocatorDefinition } from './locator';

interface PluginsDependencies {
usageCollection: UsageCollectionSetup;
management: ManagementSetup;
share: SharePluginSetup;
home?: HomePublicPluginSetup;
}

Expand Down Expand Up @@ -79,6 +82,12 @@ export class SnapshotRestoreUIPlugin {
order: 630,
});
}

plugins.share.url.locators.create(
new SnapshotRestoreLocatorDefinition({
managementAppLocator: plugins.management.locator,
})
);
}

public start() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,24 @@ import {
notificationServiceMock,
applicationServiceMock,
} from 'src/core/public/mocks';
import { sharePluginMock } from 'src/plugins/share/public/mocks';
import { HttpSetup } from 'src/core/public';

import { mockKibanaSemverVersion } from '../../../common/constants';
import { apiService } from '../../../public/application/lib/api';
import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';

// We'll mock these values to avoid testing the locators themselves.
const idToUrlMap = {
SNAPSHOT_RESTORE_LOCATOR: 'snapshotAndRestoreUrl',
};

const shareMock = sharePluginMock.createSetupContract();
shareMock.url.locators.get = (id) => ({
// @ts-expect-error This object is missing some properties that we're not using in the UI
getUrl: (): string | undefined => idToUrlMap[id],
});

export const getAppContextMock = (mockHttpClient: HttpSetup) => ({
http: mockHttpClient,
docLinks: docLinksServiceMock.createStartContract(),
Expand All @@ -31,4 +43,5 @@ export const getAppContextMock = (mockHttpClient: HttpSetup) => ({
breadcrumbs: breadcrumbService,
getUrlForApp: applicationServiceMock.createStartContract().getUrlForApp,
deprecations: deprecationsServiceMock.createStartContract(),
share: shareMock,
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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 { setupEnvironment } from '../../helpers';
import { OverviewTestBed, setupOverviewPage } from '../overview.helpers';

describe('Overview - Backup Step', () => {
let testBed: OverviewTestBed;
const { server } = setupEnvironment();

beforeEach(async () => {
testBed = await setupOverviewPage();
testBed.component.update();
});

afterAll(() => {
server.restore();
});

describe('On-prem', () => {
test('Shows link to Snapshot and Restore', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was wondering if we should also assert on the url of the link in order to be more explicit about where we are expecting users to go 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for suggesting this! I added a test, but tried to structure the mocks to avoid testing the locator itself. Love to hear your thoughts on this.

const { exists, find } = testBed;
expect(exists('snapshotRestoreLink')).toBe(true);
expect(find('snapshotRestoreLink').props().href).toBe('snapshotAndRestoreUrl');
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ describe('Overview - Upgrade Step', () => {
server.restore();
});

describe('Step 3 - Upgrade stack', () => {
test('Shows link to setup upgrade docs for on-prem installations', () => {
describe('On-prem', () => {
test('Shows link to setup upgrade docs', () => {
const { exists } = testBed;

expect(exists('upgradeSetupDocsLink')).toBe(true);
expect(exists('upgradeSetupCloudLink')).toBe(false);
});
});

test('Shows upgrade cta and link to docs for cloud installations', async () => {
describe('On Cloud', () => {
test('Shows upgrade CTA and link to docs', async () => {
await act(async () => {
testBed = await setupOverviewPage({
kibanaContextOverrides: {
Expand All @@ -47,8 +49,8 @@ describe('Overview - Upgrade Step', () => {
const { component, exists, find } = testBed;
component.update();

expect(exists('upgradeSetupCloudLink')).toBe(true);
expect(exists('upgradeSetupDocsLink')).toBe(true);
expect(exists('upgradeSetupCloudLink')).toBe(true);

expect(find('upgradeSetupCloudLink').props().href).toBe(
'https://cloud.elastic.co./deployments/bfdad4ef99a24212a06d387593686d63'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/upgrade_assistant/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"githubTeam": "kibana-stack-management"
},
"configPath": ["xpack", "upgrade_assistant"],
"requiredPlugins": ["management", "discover", "data", "licensing", "features", "infra"],
"requiredPlugins": ["management", "discover", "data", "licensing", "features", "infra", "share"],
"optionalPlugins": ["usageCollection", "cloud"],
"requiredBundles": ["esUiShared", "kibanaReact"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
* 2.0.
*/

import React, { createContext, useContext } from 'react';
import {
CoreStart,
DeprecationsServiceStart,
DocLinksStart,
HttpSetup,
NotificationsStart,
} from 'src/core/public';
import React, { createContext, useContext } from 'react';
import { SharePluginSetup } from 'src/plugins/share/public';
import { ApiService } from './lib/api';
import { BreadcrumbService } from './lib/breadcrumbs';

Expand All @@ -32,6 +33,7 @@ export interface ContextValue {
breadcrumbs: BreadcrumbService;
getUrlForApp: CoreStart['application']['getUrlForApp'];
deprecations: DeprecationsServiceStart;
share: SharePluginSetup;
}

export const AppContext = createContext<ContextValue>({} as any);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* 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 React, { useState, useEffect } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiText, EuiButton, EuiSpacer } from '@elastic/eui';
import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';

import { useAppContext } from '../../../app_context';

const i18nTexts = {
backupStepTitle: i18n.translate('xpack.upgradeAssistant.overview.backupStepTitle', {
defaultMessage: 'Back up your data',
}),

backupStepDescription: i18n.translate('xpack.upgradeAssistant.overview.backupStepDescription', {
defaultMessage: 'Back up your data before addressing any deprecation issues.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll defer to @debadair, but I think in some places we've changed the copy to "deprecation warnings" rather than "deprecation issues".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. I did a quick search of the codebase and found numerous references to "deprecation issues" outside the scope of this PR. How about I address them all in their own PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 sounds good, thanks!

}),
};

const SnapshotRestoreAppLink: React.FunctionComponent = () => {
const { share } = useAppContext();

const [snapshotRestoreUrl, setSnapshotRestoreUrl] = useState<string | undefined>();

useEffect(() => {
const getSnapshotRestoreUrl = async () => {
const locator = share.url.locators.get('SNAPSHOT_RESTORE_LOCATOR');

if (!locator) {
return;
}

const url = await locator.getUrl({
page: 'snapshots',
});
setSnapshotRestoreUrl(url);
};

getSnapshotRestoreUrl();
}, [share]);

return (
<EuiButton href={snapshotRestoreUrl} data-test-subj="snapshotRestoreLink">
{i18n.translate('xpack.upgradeAssistant.overview.snapshotRestoreLink', {
defaultMessage: 'Create snapshot',
})}
</EuiButton>
);
};

const BackupStep: React.FunctionComponent = () => {
return (
<>
<EuiText>
<p>{i18nTexts.backupStepDescription}</p>
</EuiText>

<EuiSpacer size="s" />

<SnapshotRestoreAppLink />
</>
);
};

export const getBackupStep = (): EuiStepProps => {
return {
title: i18nTexts.backupStepTitle,
status: 'incomplete',
children: <BackupStep />,
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* 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.
*/

export { getBackupStep } from './backup_step';
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';

import { useAppContext } from '../../app_context';
import { getBackupStep } from './backup_step';
import { getFixIssuesStep } from './fix_issues_step';
import { getFixLogsStep } from './fix_logs_step';
import { getUpgradeStep } from './upgrade_step';
Expand Down Expand Up @@ -83,6 +84,7 @@ export const Overview: FunctionComponent = () => {

<EuiSteps
steps={[
getBackupStep(),
getFixIssuesStep({ nextMajor }),
getFixLogsStep(),
getUpgradeStep({ docLinks, nextMajor }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const i18nTexts = {
}),
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 the Elastic Stack.",
"Once you've resolved all critical issues and verified that your applications are ready, you can upgrade the Elastic Stack. Be sure to back up your data again before upgrading.",
}),
upgradeStepDescriptionForCloud: i18n.translate(
'xpack.upgradeAssistant.overview.upgradeStepDescriptionForCloud',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,36 @@
* 2.0.
*/

import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { CoreSetup } from 'src/core/public';
import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
import { renderApp } from './render_app';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this file be removed now?

import { ManagementAppMountParams } from 'src/plugins/management/public';
import { SharePluginSetup } from 'src/plugins/share/public';

import { KibanaVersionContext } from './app_context';
import { AppDependencies, RootComponent } from './app';
import { apiService } from './lib/api';
import { breadcrumbService } from './lib/breadcrumbs';
import { AppServicesContext } from '../types';

interface BootDependencies extends AppDependencies {
element: HTMLElement;
}

const renderApp = (deps: BootDependencies) => {
const { element, ...appDependencies } = deps;
render(<RootComponent {...appDependencies} />, element);
return () => {
unmountComponentAtNode(element);
};
};

export async function mountManagementSection(
coreSetup: CoreSetup,
params: ManagementAppMountParams,
kibanaVersionInfo: KibanaVersionContext,
readonly: boolean,
share: SharePluginSetup,
services: AppServicesContext
) {
const [
Expand All @@ -44,6 +61,7 @@ export async function mountManagementSection(
getUrlForApp: application.getUrlForApp,
deprecations,
application,
share,
services,
});
}
Loading