diff --git a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap index 61855f17954e..83e4f069e2ad 100644 --- a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap +++ b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap @@ -26,12 +26,6 @@ exports[`home change home route should render a link to change the default route - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -`; - -exports[`home welcome stores skip welcome setting if skipped 1`] = `
- + +
+`; + +exports[`home welcome stores skip welcome setting if skipped 1`] = ` +
+ + } + /> +
+ - - - - diff --git a/src/plugins/home/public/application/components/home.test.js b/src/plugins/home/public/application/components/home.test.js index 444c5f388bb2..6f732256fb37 100644 --- a/src/plugins/home/public/application/components/home.test.js +++ b/src/plugins/home/public/application/components/home.test.js @@ -296,9 +296,6 @@ describe('home', () => { find: () => Promise.resolve({ total: 0 }), }); - component.instance().skipWelcome(); - component.update(); - sinon.assert.calledWith(defaultProps.localStorage.setItem, 'home:welcome:show', 'false'); expect(component).toMatchSnapshot(); diff --git a/src/plugins/home/public/application/components/home_app.js b/src/plugins/home/public/application/components/home_app.js index 4e8dd16dd998..ac10eeedb454 100644 --- a/src/plugins/home/public/application/components/home_app.js +++ b/src/plugins/home/public/application/components/home_app.js @@ -33,11 +33,7 @@ import { I18nProvider } from '@osd/i18n/react'; import PropTypes from 'prop-types'; import { Home } from './home'; import { FeatureDirectory } from './feature_directory'; -import { TutorialDirectory } from './tutorial_directory'; -import { Tutorial } from './tutorial/tutorial'; import { HashRouter as Router, Switch, Route } from 'react-router-dom'; -import { getTutorial } from '../load_tutorials'; -import { replaceTemplateStrings } from './tutorial/replace_template_strings'; import { getServices } from '../opensearch_dashboards_services'; import { useMount } from 'react-use'; @@ -50,45 +46,12 @@ const RedirectToDefaultApp = () => { }; export function HomeApp({ directories, solutions }) { - const { - savedObjectsClient, - getBasePath, - addBasePath, - environmentService, - telemetry, - } = getServices(); - const environment = environmentService.getEnvironment(); - const isCloudEnabled = environment.cloud; - - const renderTutorialDirectory = (props) => { - return ( - - ); - }; - - const renderTutorial = (props) => { - return ( - - ); - }; + const { savedObjectsClient, getBasePath, addBasePath, telemetry } = getServices(); return ( - - diff --git a/src/plugins/home/public/plugin.test.ts b/src/plugins/home/public/plugin.test.ts index c311b6ee0fe5..ab23a292a585 100644 --- a/src/plugins/home/public/plugin.test.ts +++ b/src/plugins/home/public/plugin.test.ts @@ -58,7 +58,7 @@ describe('HomePublicPlugin', () => { category: 'data', icon: 'indexOpen', id: 'home_tutorial_directory', - showOnHomePage: true, + showOnHomePage: false, }) ); }); diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts index 03823c5da179..277abdcdf968 100644 --- a/src/plugins/home/public/plugin.ts +++ b/src/plugins/home/public/plugin.ts @@ -130,7 +130,8 @@ export class HomePublicPlugin urlForwarding.forwardApp('home', 'home'); const featureCatalogue = { ...this.featuresCatalogueRegistry.setup() }; - + // Disable sample data in home/view app directory + // To activate it again, remove visible() and change showOnHomePage to true. featureCatalogue.register({ id: 'home_tutorial_directory', title: i18n.translate('home.tutorialDirectory.featureCatalogueTitle', { @@ -140,9 +141,12 @@ export class HomePublicPlugin defaultMessage: 'Get started with sample data, visualizations, and dashboards.', }), icon: 'indexOpen', - showOnHomePage: true, + showOnHomePage: false, path: `${HOME_APP_BASE_PATH}#/tutorial_directory`, category: 'data' as FeatureCatalogueCategory.DATA, + visible() { + return false; + }, order: 500, }); diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap index a617fa0511e2..8a36dc08a89e 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap @@ -29,35 +29,7 @@ exports[`EmptyState should render normally 1`] = ` className="inpEmptyState__cardGrid" columns={3} responsive={true} - > - - - } - icon={ - - } - onClick={[Function]} - title={ - - } - /> - - + /> diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx index 96862e59ffa5..4a1d7f518e05 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx @@ -172,25 +172,6 @@ export const EmptyState = ({ /> */} {getMlCardState() !== MlCardState.HIDDEN ? mlCard : <>} - - navigateToApp('home', { path: '#/tutorial_directory/sampleData' })} - icon={} - title={ - - } - description={ - - } - /> -
diff --git a/src/plugins/opensearch_dashboards_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap b/src/plugins/opensearch_dashboards_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap index 9df3bb12caec..f2a26c2fa3b1 100644 --- a/src/plugins/opensearch_dashboards_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap +++ b/src/plugins/opensearch_dashboards_overview/public/components/getting_started/__snapshots__/getting_started.test.tsx.snap @@ -168,19 +168,6 @@ exports[`GettingStarted dark mode on 1`] = ` - - - - -
- - - - -
= ({ addBasePath, isDarkTheme, apps }) => - - - - - - diff --git a/src/plugins/opensearch_dashboards_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/opensearch_dashboards_overview/public/components/overview/__snapshots__/overview.test.tsx.snap index 198e0119ebd8..d02f740e1a41 100644 --- a/src/plugins/opensearch_dashboards_overview/public/components/overview/__snapshots__/overview.test.tsx.snap +++ b/src/plugins/opensearch_dashboards_overview/public/components/overview/__snapshots__/overview.test.tsx.snap @@ -1032,75 +1032,6 @@ exports[`Overview without solutions 1`] = ` - - - = ({ newsFetchResult, solutions, features, bran : 'osdOverviewData--expanded' }`} > - - - - diff --git a/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap b/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap index 72a25d779ded..dd2b5075a659 100644 --- a/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap +++ b/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/__snapshots__/overview_page_header.test.tsx.snap @@ -33,34 +33,7 @@ exports[`OverviewPageHeader in dark mode render logo as custom dark mode logo className="osdOverviewPageHeader__actions" responsive={false} wrap={true} - > - - - - Add data - - - - + /> @@ -100,34 +73,7 @@ exports[`OverviewPageHeader in dark mode render logo as custom default mode lo className="osdOverviewPageHeader__actions" responsive={false} wrap={true} - > - - - - Add data - - - - + /> @@ -167,34 +113,7 @@ exports[`OverviewPageHeader in dark mode render logo as original dark mode ope className="osdOverviewPageHeader__actions" responsive={false} wrap={true} - > - - - - Add data - - - - + /> @@ -234,34 +153,7 @@ exports[`OverviewPageHeader in default mode render logo as custom default mode className="osdOverviewPageHeader__actions" responsive={false} wrap={true} - > - - - - Add data - - - - + /> @@ -301,34 +193,7 @@ exports[`OverviewPageHeader in default mode render logo as original default mo className="osdOverviewPageHeader__actions" responsive={false} wrap={true} - > - - - - Add data - - - - + /> diff --git a/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/overview_page_header.tsx b/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/overview_page_header.tsx index 00273fcf993b..c48c3c553c1b 100644 --- a/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/overview_page_header.tsx +++ b/src/plugins/opensearch_dashboards_react/public/overview_page/overview_page_header/overview_page_header.tsx @@ -159,24 +159,6 @@ export const OverviewPageHeader: FC = ({ {!hideToolbar && ( - - - - {i18n.translate( - 'opensearch-dashboards-react.osdOverviewPageHeader.addDataButtonLabel', - { - defaultMessage: 'Add data', - } - )} - - - - {showManagementLink && isManagementEnabled ? ( diff --git a/test/functional/apps/home/_sample_data.ts b/test/functional/apps/home/_sample_data.ts index 9f78c5eec4e6..002b39c7ea4f 100644 --- a/test/functional/apps/home/_sample_data.ts +++ b/test/functional/apps/home/_sample_data.ts @@ -42,7 +42,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const dashboardExpect = getService('dashboardExpect'); const PageObjects = getPageObjects(['common', 'header', 'home', 'dashboard', 'timePicker']); - describe('sample data', function describeIndexTests() { + /** + * This test suite is skipped because the seccion of the sample data set is not available in the UI. + */ + describe.skip('sample data', function describeIndexTests() { before(async () => { await security.testUser.setRoles([ 'opensearch_dashboards_admin', diff --git a/test/functional/apps/visualize/_custom_branding.ts b/test/functional/apps/visualize/_custom_branding.ts index 37f07e932ee5..e9ba9d8846b3 100644 --- a/test/functional/apps/visualize/_custom_branding.ts +++ b/test/functional/apps/visualize/_custom_branding.ts @@ -81,7 +81,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); }); - it('with customized logo', async () => { + /** + * This test is omitted because the welcome page has been removed. + */ + it.skip('with customized logo', async () => { await testSubjects.existOrFail('welcomeCustomLogo'); const actualLabel = await testSubjects.getAttribute( 'welcomeCustomLogo', @@ -90,7 +93,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { expect(actualLabel.toUpperCase()).to.equal(expectedMarkLogo.toUpperCase()); }); - it('with customized title', async () => { + it.skip('with customized title', async () => { await testSubjects.existOrFail('welcomeCustomTitle'); const actualLabel = await testSubjects.getAttribute( 'welcomeCustomTitle', @@ -99,7 +102,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { expect(actualLabel.toUpperCase()).to.equal(expectedWelcomeMessage.toUpperCase()); }); - it('with customized logo in dark mode', async () => { + it.skip('with customized logo in dark mode', async () => { await PageObjects.common.navigateToApp('management/opensearch-dashboards/settings'); await PageObjects.settings.toggleAdvancedSettingCheckbox('theme:darkMode'); await PageObjects.common.navigateToApp('home');