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

[Workspace]Import sample data to current workspace #6105

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4321cb4
Import sample data to workspace
wanglam Mar 11, 2024
d29f691
Enable workspace ui plugin
wanglam Mar 11, 2024
54adb59
Add changelog for import sample data to current workspace
wanglam Mar 11, 2024
5240160
Merge remote-tracking branch 'origin/main' into feat-import-sample-da…
wanglam Mar 22, 2024
ee39682
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam Apr 10, 2024
b1da07e
Merge branch 'main' into feat-import-sample-data-to-workspace
SuZhou-Joe Apr 18, 2024
b4c0c27
feat: register sample data as standalone app (#8)
SuZhou-Joe May 6, 2024
0d44b0f
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 6, 2024
e4a6c74
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 7, 2024
9b3be8f
Retrieve workspace id from request
wanglam May 7, 2024
5098c09
Remove workspace id in query
wanglam May 7, 2024
58adba2
Move changelog to fragments
wanglam May 8, 2024
0e7c5e1
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 8, 2024
f11844f
Fix sample data list unit tests
wanglam May 8, 2024
efc5b1c
Remove no need workspaces deps
wanglam May 8, 2024
8b67b94
Remove manual created changelogs
wanglam May 8, 2024
e87cb72
Changeset file for PR #6105 created/updated
opensearch-changeset-bot[bot] May 8, 2024
799f475
Enable sample data in workspace overview page (#9)
Hailong-am May 9, 2024
fb4c3a2
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 9, 2024
5767ffc
Add unit tests for getFinalSavedObjects in data sets util file
wanglam May 9, 2024
eda80ff
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 13, 2024
dd998f3
Add unit tests for renderImportSampleDataApp destroy
wanglam May 13, 2024
7d7a831
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 14, 2024
a7e8c72
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 15, 2024
9769622
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 16, 2024
28d1f74
Address PR comments
wanglam May 17, 2024
6162c2d
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 17, 2024
b82fcec
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 18, 2024
5f8f9f4
Remove history listen in renderImportSampleDataApp
wanglam May 21, 2024
3f27d71
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 21, 2024
4d560c6
Remove Route for workspace import sample data entry point
wanglam May 22, 2024
9a2bd3e
Merge branch 'main' into feat-import-sample-data-to-workspace
wanglam May 24, 2024
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: 2 additions & 0 deletions changelogs/fragments/6105.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
feat:
- [Workspace]Import sample data to current workspace ([#6105](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6105))
1 change: 1 addition & 0 deletions src/plugins/home/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@
export const PLUGIN_ID = 'home';
export const HOME_APP_BASE_PATH = `/app/${PLUGIN_ID}`;
export const USE_NEW_HOME_PAGE = 'home:useNewHomePage';
export const IMPORT_SAMPLE_DATA_APP_ID = 'import_sample_data';
43 changes: 43 additions & 0 deletions src/plugins/home/public/application/application.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import React, { useEffect, useRef } from 'react';
import { render } from '@testing-library/react';
import { coreMock } from '../../../../core/public/mocks';
import { renderImportSampleDataApp } from './application';

jest.mock('./components/home_app', () => ({
HomeApp: () => 'HomeApp',
ImportSampleDataApp: () => 'ImportSampleDataApp',
}));

const coreStartMocks = coreMock.createStart();

const ComponentForRender = (props: { renderFn: typeof renderImportSampleDataApp }) => {
const container = useRef<HTMLDivElement>(null);
useEffect(() => {
if (container.current) {
const destroyFn = props.renderFn(container.current, coreStartMocks);
return () => {
destroyFn.then((res) => res());
};
}
}, [props]);

return <div ref={container} />;
};

describe('renderImportSampleDataApp', () => {
it('should render ImportSampleDataApp when calling renderImportSampleDataApp', async () => {
const { container } = render(<ComponentForRender renderFn={renderImportSampleDataApp} />);
expect(container).toMatchInlineSnapshot(`
<div>
<div>
ImportSampleDataApp
</div>
</div>
`);
});
});
15 changes: 14 additions & 1 deletion src/plugins/home/public/application/application.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { i18n } from '@osd/i18n';
import { ScopedHistory, CoreStart } from 'opensearch-dashboards/public';
import { OpenSearchDashboardsContextProvider } from '../../../opensearch_dashboards_react/public';
// @ts-ignore
import { HomeApp } from './components/home_app';
import { HomeApp, ImportSampleDataApp } from './components/home_app';
import { getServices } from './opensearch_dashboards_services';

import './index.scss';
Expand Down Expand Up @@ -77,3 +77,16 @@ export const renderApp = async (
unlisten();
};
};

export const renderImportSampleDataApp = async (element: HTMLElement, coreStart: CoreStart) => {
render(
<OpenSearchDashboardsContextProvider services={{ ...coreStart }}>
<ImportSampleDataApp />
</OpenSearchDashboardsContextProvider>,
element
);

return () => {
unmountComponentAtNode(element);
};
};
39 changes: 29 additions & 10 deletions src/plugins/home/public/application/components/home_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,35 @@ const RedirectToDefaultApp = () => {
return null;
};

const renderTutorialDirectory = (props) => {
const { addBasePath, environmentService } = getServices();
const environment = environmentService.getEnvironment();
const isCloudEnabled = environment.cloud;

return (
<TutorialDirectory
addBasePath={addBasePath}
openTab={props.match.params.tab}
isCloudEnabled={isCloudEnabled}
withoutHomeBreadCrumb={props.withoutHomeBreadCrumb}
/>
);
};

export function ImportSampleDataApp() {
return (
<I18nProvider>
{renderTutorialDirectory({
// Pass a fixed tab to avoid TutorialDirectory missing openTab property
match: {
params: { tab: 'sampleData' },
},
withoutHomeBreadCrumb: true,
})}
</I18nProvider>
);
}

export function HomeApp({ directories, solutions }) {
const {
savedObjectsClient,
Expand All @@ -63,16 +92,6 @@ export function HomeApp({ directories, solutions }) {
const environment = environmentService.getEnvironment();
const isCloudEnabled = environment.cloud;

const renderTutorialDirectory = (props) => {
return (
<TutorialDirectory
addBasePath={addBasePath}
openTab={props.match.params.tab}
isCloudEnabled={isCloudEnabled}
/>
);
};

const renderTutorial = (props) => {
return (
<Tutorial
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import React from 'react';
import { render } from '@testing-library/react';
import { setServices } from '../opensearch_dashboards_services';
import { getMockedServices } from '../opensearch_dashboards_services.mock';
import { ImportSampleDataApp, HomeApp } from './home_app';

jest.mock('./legacy/home', () => ({
Home: () => <div>Home</div>,
}));

jest.mock('../load_tutorials', () => ({
getTutorial: () => {},
}));

jest.mock('./tutorial_directory', () => ({
TutorialDirectory: (props: { withoutHomeBreadCrumb?: boolean }) => (
<div
data-test-subj="tutorial_directory"
data-without-home-bread-crumb={!!props.withoutHomeBreadCrumb}
/>
),
}));

describe('<HomeApp />', () => {
let currentService: ReturnType<typeof getMockedServices>;
beforeEach(() => {
currentService = getMockedServices();
setServices(currentService);
});

it('should not pass withoutHomeBreadCrumb to TutorialDirectory component', async () => {
const originalHash = window.location.hash;
const { findByTestId } = render(<HomeApp />);
window.location.hash = '/tutorial_directory';
const tutorialRenderResult = await findByTestId('tutorial_directory');
expect(tutorialRenderResult.dataset.withoutHomeBreadCrumb).toEqual('false');

// revert to original hash
window.location.hash = originalHash;
});
});

describe('<ImportSampleDataApp />', () => {
let currentService: ReturnType<typeof getMockedServices>;
beforeEach(() => {
currentService = getMockedServices();
setServices(currentService);
});

it('should pass withoutHomeBreadCrumb to TutorialDirectory component', async () => {
const { findByTestId } = render(<ImportSampleDataApp />);
const tutorialRenderResult = await findByTestId('tutorial_directory');
expect(tutorialRenderResult.dataset.withoutHomeBreadCrumb).toEqual('true');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,17 @@ class TutorialDirectoryUi extends React.Component {

async componentDidMount() {
this._isMounted = true;

getServices().chrome.setBreadcrumbs([
{
const { chrome } = getServices();
const { withoutHomeBreadCrumb } = this.props;
const breadcrumbs = [{ text: addDataTitle }];
if (!withoutHomeBreadCrumb) {
breadcrumbs.splice(0, 0, {
text: homeTitle,
href: '#/',
},
{ text: addDataTitle },
]);
});
}

chrome.setBreadcrumbs(breadcrumbs);

const tutorialConfigs = await getTutorials();

Expand Down Expand Up @@ -322,6 +325,7 @@ TutorialDirectoryUi.propTypes = {
addBasePath: PropTypes.func.isRequired,
openTab: PropTypes.string,
isCloudEnabled: PropTypes.bool.isRequired,
withoutHomeBreadCrumb: PropTypes.bool,
};

export const TutorialDirectory = injectI18n(TutorialDirectoryUi);
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import React from 'react';
import { render } from '@testing-library/react';
import { IntlProvider } from 'react-intl';
import { coreMock } from '../../../../../core/public/mocks';
import { setServices } from '../opensearch_dashboards_services';
import { getMockedServices } from '../opensearch_dashboards_services.mock';

const makeProps = () => {
const coreMocks = coreMock.createStart();
return {
addBasePath: coreMocks.http.basePath.prepend,
openTab: 'foo',
isCloudEnabled: false,
};
};

describe('<TutorialDirectory />', () => {
let currentService: ReturnType<typeof getMockedServices>;
beforeEach(() => {
currentService = getMockedServices();
setServices(currentService);
});
it('should render home breadcrumbs when withoutHomeBreadCrumb is undefined', async () => {
const finalProps = makeProps();
currentService.http.get.mockResolvedValueOnce([]);
// @ts-ignore
const { TutorialDirectory } = await import('./tutorial_directory');
render(
<IntlProvider locale="en">
<TutorialDirectory {...finalProps} />
</IntlProvider>
);
expect(currentService.chrome.setBreadcrumbs).toBeCalledWith([
{
href: '#/',
text: 'Home',
},
{
text: 'Add data',
},
]);
});

it('should not render home breadcrumbs when withoutHomeBreadCrumb is true', async () => {
const finalProps = makeProps();
currentService.http.get.mockResolvedValueOnce([]);
// @ts-ignore
const { TutorialDirectory } = await import('./tutorial_directory');
render(
<IntlProvider locale="en">
<TutorialDirectory {...finalProps} withoutHomeBreadCrumb />
</IntlProvider>
);
expect(currentService.chrome.setBreadcrumbs).toBeCalledWith([
{
text: 'Add data',
},
]);
});
});
2 changes: 1 addition & 1 deletion src/plugins/home/public/application/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
* under the License.
*/

export { renderApp } from './application';
export { renderApp, renderImportSampleDataApp } from './application';
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import { coreMock } from '../../../../core/public/mocks';
import { urlForwardingPluginMock } from '../../../url_forwarding/public/mocks';
import { homePluginMock } from '../mocks';
import {
EnvironmentService,
FeatureCatalogueRegistry,
SectionTypeService,
TutorialService,
} from '../services';
import { telemetryPluginMock } from '../../../telemetry/public/mocks';

export const getMockedServices = () => {
const coreMocks = coreMock.createStart();
const urlForwarding = urlForwardingPluginMock.createStartContract();
const homePlugin = homePluginMock.createSetupContract();
return {
...coreMocks,
...homePlugin,
telemetry: telemetryPluginMock.createStartContract(),
indexPatternService: jest.fn(),
dataSource: {
dataSourceEnabled: false,
hideLocalCluster: false,
noAuthenticationTypeEnabled: false,
usernamePasswordAuthEnabled: false,
awsSigV4AuthEnabled: false,
},
opensearchDashboardsVersion: '',
urlForwarding,
savedObjectsClient: coreMocks.savedObjects.client,
toastNotifications: coreMocks.notifications.toasts,
banners: coreMocks.overlays.banners,
trackUiMetric: jest.fn(),
getBasePath: jest.fn(),
addBasePath: jest.fn(),
environmentService: new EnvironmentService(),
tutorialService: new TutorialService(),
homeConfig: homePlugin.config,
featureCatalogue: new FeatureCatalogueRegistry(),
sectionTypes: new SectionTypeService(),
};
};
8 changes: 8 additions & 0 deletions src/plugins/home/public/plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,13 @@ describe('HomePublicPlugin', () => {
expect(setup).toHaveProperty('tutorials');
expect(setup.tutorials).toHaveProperty('setVariable');
});

test('wires up and register applications', async () => {
const coreMocks = coreMock.createSetup();
await new HomePublicPlugin(mockInitializerContext).setup(coreMocks, {
urlForwarding: urlForwardingPluginMock.createSetupContract(),
});
expect(coreMocks.application.register).toBeCalledTimes(2);
});
});
});
Loading
Loading