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.

Sign up for GitHub

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

[7.x] [Fleet] Have EPR register new categories / Show category counts (#114429) #114870

Merged
merged 1 commit into from
Oct 13, 2021
+130 −164
Merged

[7.x] [Fleet] Have EPR register new categories / Show category counts (#114429) #114870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions src/plugins/custom_integrations/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ export const INTEGRATION_CATEGORY_DISPLAY = {
// Kibana added
upload_file: 'Upload a file',
language_client: 'Language client',

// Internal
updates_available: 'Updates available',
};

/**
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/custom_integrations/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function plugin(initializerContext: PluginInitializerContext) {

export { CustomIntegrationsPluginSetup, CustomIntegrationsPluginStart } from './types';

export type { IntegrationCategory, IntegrationCategoryCount, CustomIntegration } from '../common';
export type { IntegrationCategory, CustomIntegration } from '../common';

export const config = {
schema: schema.object({}),
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/fleet/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ export type RegistrySearchResult = Pick<
| 'internal'
| 'data_streams'
| 'policy_templates'
| 'categories'
>;

export type ScreenshotItem = RegistryImage | PackageSpecScreenshot;
Expand Down Expand Up @@ -374,6 +375,7 @@ export interface IntegrationCardItem {
icons: Array<PackageSpecIcon | CustomIntegrationIcon>;
integration: string;
id: string;
categories: string[];
}

export type PackagesGroupedByStatus = Record<ValueOf<InstallationStatus>, PackageList>;
Expand Down
40 changes: 7 additions & 33 deletions ...s/use_merge_epr_with_replacements.test.ts → ...s/use_merge_epr_with_replacements.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* 2.0.
*/

import type { PackageListItem } from '../../common/types/models';
import type { CustomIntegration } from '../../../../../src/plugins/custom_integrations/common';
import type { PackageListItem } from '../../../../common/types/models';
import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';

import type { IntegrationCategory } from '../../../../../src/plugins/custom_integrations/common';
import type { IntegrationCategory } from '../../../../../../../src/plugins/custom_integrations/common';

import { useMergeEprPackagesWithReplacements } from './use_merge_epr_with_replacements';

Expand Down Expand Up @@ -46,7 +46,7 @@ describe('useMergeEprWithReplacements', () => {
},
]);

expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
{
name: 'aws',
release: 'ga',
Expand Down Expand Up @@ -80,7 +80,7 @@ describe('useMergeEprWithReplacements', () => {
},
]);

expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
{
eprOverlap: 'activemq',
id: 'activemq-logs',
Expand Down Expand Up @@ -108,7 +108,7 @@ describe('useMergeEprWithReplacements', () => {
},
]);

expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
{
name: 'activemq',
release: 'beta',
Expand All @@ -120,32 +120,6 @@ describe('useMergeEprWithReplacements', () => {
]);
});

test('should respect category assignment', () => {
const eprPackages: PackageListItem[] = mockEprPackages([
{
name: 'activemq',
release: 'beta',
},
]);
const replacements: CustomIntegration[] = mockIntegrations([
{
id: 'prometheus',
categories: ['monitoring', 'datastore'],
},
{
id: 'oracle',
categories: ['datastore'],
},
]);

expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, 'web')).toEqual([
{
name: 'activemq',
release: 'beta',
},
]);
});

test('should consists of all 3 types (ga eprs, replacements for non-ga eprs, replacements without epr equivalent', () => {
const eprPackages: PackageListItem[] = mockEprPackages([
{
Expand Down Expand Up @@ -190,7 +164,7 @@ describe('useMergeEprWithReplacements', () => {
},
]);

expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
{
name: 'aws',
release: 'ga',
Expand Down
19 changes: 6 additions & 13 deletions .../hooks/use_merge_epr_with_replacements.ts → .../hooks/use_merge_epr_with_replacements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
* 2.0.
*/

import type { PackageListItem } from '../../common/types/models';
import type {
CustomIntegration,
IntegrationCategory,
} from '../../../../../src/plugins/custom_integrations/common';
import { filterCustomIntegrations } from '../../../../../src/plugins/custom_integrations/public';
import type { PackageListItem } from '../../../../common/types/models';
import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';
import { filterCustomIntegrations } from '../../../../../../../src/plugins/custom_integrations/public';

// Export this as a utility to find replacements for a package (e.g. in the overview-page for an EPR package)
function findReplacementsForEprPackage(
Expand All @@ -26,17 +23,13 @@ function findReplacementsForEprPackage(

export function useMergeEprPackagesWithReplacements(
eprPackages: PackageListItem[],
replacements: CustomIntegration[],
category: IntegrationCategory | ''
replacements: CustomIntegration[]
): Array<PackageListItem | CustomIntegration> {
const merged: Array<PackageListItem | CustomIntegration> = [];

const filteredReplacements = replacements.filter((customIntegration) => {
return !category || customIntegration.categories.includes(category);
});
const filteredReplacements = replacements;

// Either select replacement or select beat
eprPackages.forEach((eprPackage) => {
eprPackages.forEach((eprPackage: PackageListItem) => {
const hits = findReplacementsForEprPackage(
filteredReplacements,
eprPackage.name,
Expand Down
1 change: 1 addition & 0 deletions ...s/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const args: Args = {
url: '/',
icons: [],
integration: '',
categories: ['foobar'],
};

const argTypes = {
Expand Down
6 changes: 6 additions & 0 deletions ...et/public/applications/integrations/sections/epm/components/package_list_grid.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
{
title: 'Package Two',
Expand All @@ -58,6 +59,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
{
title: 'Package Three',
Expand All @@ -69,6 +71,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
{
title: 'Package Four',
Expand All @@ -80,6 +83,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
{
title: 'Package Five',
Expand All @@ -91,6 +95,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
{
title: 'Package Six',
Expand All @@ -102,6 +107,7 @@ export const List = (props: Args) => (
url: 'https://example.com',
icons: [],
integration: 'integation',
categories: ['web'],
},
]}
onSearchChange={action('onSearchChange')}
Expand Down
Loading