[Fleet] Have EPR register new categories / Show category counts (elas…

…tic#114429)
gbamparop · Oct 13, 2021 · af30836 · af30836
1 parent 3e1960e
commit af30836
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 164 deletions.
diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts
@@ -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',
 };
 
 /**

diff --git a/src/plugins/custom_integrations/server/index.ts b/src/plugins/custom_integrations/server/index.ts
@@ -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({}),

diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -227,6 +227,7 @@ export type RegistrySearchResult = Pick<
   | 'internal'
   | 'data_streams'
   | 'policy_templates'
+  | 'categories'
 >;
 
 export type ScreenshotItem = RegistryImage | PackageSpecScreenshot;
@@ -376,6 +377,7 @@ export interface IntegrationCardItem {
   icons: Array<PackageSpecIcon | CustomIntegrationIcon>;
   integration: string;
   id: string;
+  categories: string[];
 }
 
 export type PackagesGroupedByStatus = Record<ValueOf<InstallationStatus>, PackageList>;

diff --git a/...s/use_merge_epr_with_replacements.test.ts → ...s/use_merge_epr_with_replacements.test.ts b/...s/use_merge_epr_with_replacements.test.ts → ...s/use_merge_epr_with_replacements.test.ts
@@ -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';
 
@@ -46,7 +46,7 @@ describe('useMergeEprWithReplacements', () => {
       },
     ]);
 
-    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
+    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
       {
         name: 'aws',
         release: 'ga',
@@ -80,7 +80,7 @@ describe('useMergeEprWithReplacements', () => {
       },
     ]);
 
-    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
+    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
       {
         eprOverlap: 'activemq',
         id: 'activemq-logs',
@@ -108,7 +108,7 @@ describe('useMergeEprWithReplacements', () => {
       },
     ]);
 
-    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
+    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
       {
         name: 'activemq',
         release: 'beta',
@@ -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([
       {
@@ -190,7 +164,7 @@ describe('useMergeEprWithReplacements', () => {
       },
     ]);
 
-    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements, '')).toEqual([
+    expect(useMergeEprPackagesWithReplacements(eprPackages, replacements)).toEqual([
       {
         name: 'aws',
         release: 'ga',

diff --git a/.../hooks/use_merge_epr_with_replacements.ts → .../hooks/use_merge_epr_with_replacements.ts b/.../hooks/use_merge_epr_with_replacements.ts → .../hooks/use_merge_epr_with_replacements.ts
@@ -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(
@@ -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,

diff --git a/...s/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx b/...s/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
@@ -32,6 +32,7 @@ const args: Args = {
   url: '/',
   icons: [],
   integration: '',
+  categories: ['foobar'],
 };
 
 const argTypes = {

diff --git a/...et/public/applications/integrations/sections/epm/components/package_list_grid.stories.tsx b/...et/public/applications/integrations/sections/epm/components/package_list_grid.stories.tsx
@@ -47,6 +47,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
       {
         title: 'Package Two',
@@ -58,6 +59,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
       {
         title: 'Package Three',
@@ -69,6 +71,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
       {
         title: 'Package Four',
@@ -80,6 +83,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
       {
         title: 'Package Five',
@@ -91,6 +95,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
       {
         title: 'Package Six',
@@ -102,6 +107,7 @@ export const List = (props: Args) => (
         url: 'https://example.com',
         icons: [],
         integration: 'integation',
+        categories: ['web'],
       },
     ]}
     onSearchChange={action('onSearchChange')}