Skip to content

Commit

Permalink
04-fix-bug
Browse files Browse the repository at this point in the history
Signed-off-by: Qxisylolo <[email protected]>
  • Loading branch information
Qxisylolo committed Sep 3, 2024
1 parent b7b9103 commit 6ab8250
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 129 deletions.
9 changes: 3 additions & 6 deletions src/core/utils/default_nav_groups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ const defaultNavGroups = {
defaultMessage: 'Observability',
}),
description: i18n.translate('core.ui.group.observability.description', {
defaultMessage:
'Gain visibility into system health, performance, and reliability through monitoring and analysis of logs, metrics, and traces.',
defaultMessage: 'Gain visibility into your application and infrastructure',
}),
order: 4000,
icon: 'wsObservability',
Expand All @@ -64,8 +63,7 @@ const defaultNavGroups = {
defaultMessage: 'Security Analytics',
}),
description: i18n.translate('core.ui.group.security.analytics.description', {
defaultMessage:
'Detect and investigate potential security threats and vulnerabilities across your systems and data.',
defaultMessage: 'Enhance your security posture with advanced analytics',
}),
order: 5000,
icon: 'wsSecurityAnalytics',
Expand All @@ -88,8 +86,7 @@ const defaultNavGroups = {
defaultMessage: 'Search',
}),
description: i18n.translate('core.ui.group.search.description', {
defaultMessage:
"Quickly find and explore relevant information across your organization's data sources.",
defaultMessage: 'Discover and query your data with ease',
}),
order: 6000,
icon: 'wsSearch',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

import React from 'react';
import { render } from '@testing-library/react';
import { EuiIcon } from '@elastic/eui';

import { registerUseCaseCard, WORKSPACE_USE_CASES } from './use_case_card';
import { registerUseCaseCard } from './use_case_card';
import { contentManagementPluginMocks } from '../../../../content_management/public';

describe('registerUseCaseCard', () => {
Expand All @@ -17,18 +15,14 @@ describe('registerUseCaseCard', () => {
registerContentProvider: registerContentProviderFn,
};

it('should register a use case card correctly', () => {
const mockConfig = {
icon: 'wsObservability',
title: 'observability',
description: 'Gain visibility into your application and infrastructure',
};

it('should register useCase card correctly', () => {
registerUseCaseCard(contentManagementStartMock, {
id: 'test_id',
order: 1,
target: 'osd_homepage/get_started',
config: mockConfig,
icon: 'wsObservability',
title: 'observability',
description: 'Gain visibility into your application and infrastructure',
});

expect(contentManagementStartMock.registerContentProvider).toHaveBeenCalledTimes(1);
Expand Down
48 changes: 48 additions & 0 deletions src/plugins/home/public/application/components/use_case_card.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import React from 'react';
import { EuiIcon } from '@elastic/eui';
import { ContentManagementPluginStart } from '../../../../content_management/public';

export const registerUseCaseCard = (
contentManagement: ContentManagementPluginStart,
{
target,
order,
id,
title,
description,
icon,
}: {
target: string;
order: number;
id: string;
title: string;
description: string;
icon: string;
}
) => {
contentManagement.registerContentProvider({
id: `home_get_started_${id}`,
getTargetArea: () => target,
getContent: () => ({
id,
kind: 'card',
order,
description,
title,
cardProps: {
layout: 'horizontal',
},
getIcon: () =>
React.createElement(EuiIcon, {
size: 'l',
color: 'subdued',
type: icon,
}),
}),
});
};
91 changes: 0 additions & 91 deletions src/plugins/home/public/application/components/use_case_card.tsx

This file was deleted.

37 changes: 16 additions & 21 deletions src/plugins/home/public/application/home_render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import { CoreStart } from 'opensearch-dashboards/public';

import { DEFAULT_NAV_GROUPS } from '../../../../core/public';
import {
ContentManagementPluginSetup,
ContentManagementPluginStart,
Expand All @@ -19,7 +19,7 @@ import {
registerHomeListCard,
} from './components/home_list_card';

import { registerUseCaseCard, WORKSPACE_USE_CASES } from './components/use_case_card';
import { registerUseCaseCard } from './components/use_case_card';

export const setupHome = (contentManagement: ContentManagementPluginSetup) => {
contentManagement.registerPage({
Expand Down Expand Up @@ -61,29 +61,24 @@ export const setupHome = (contentManagement: ContentManagementPluginSetup) => {
};

export const initHome = (contentManagement: ContentManagementPluginStart, core: CoreStart) => {
// registerUseCaseCard(contentManagement,work);

const workspaceEnabled = core.application.capabilities.workspaces.enabled;

if (!workspaceEnabled) {
registerUseCaseCard(contentManagement, {
id: WORKSPACE_USE_CASES.observability.id,
order: 1,
config: WORKSPACE_USE_CASES.observability.config,
target: HOME_CONTENT_AREAS.GET_STARTED,
});
const useCases = [
DEFAULT_NAV_GROUPS.observability,
DEFAULT_NAV_GROUPS.search,
DEFAULT_NAV_GROUPS['security-analytics'],
];

registerUseCaseCard(contentManagement, {
id: WORKSPACE_USE_CASES['security-analytics'].id,
order: 2,
config: WORKSPACE_USE_CASES['security-analytics'].config,
target: HOME_CONTENT_AREAS.GET_STARTED,
});
registerUseCaseCard(contentManagement, {
id: WORKSPACE_USE_CASES.search.id,
order: 3,
target: HOME_CONTENT_AREAS.GET_STARTED,
config: WORKSPACE_USE_CASES.search.config,
useCases.forEach((useCase, index) => {
registerUseCaseCard(contentManagement, {
id: useCase.id,
order: index + 1,
description: useCase.description,
title: useCase.title,
target: HOME_CONTENT_AREAS.GET_STARTED,
icon: useCase.icon ?? '',
});
});
}

Expand Down

0 comments on commit 6ab8250

Please sign in to comment.