[Security Solution][Endpoint] Port trusted apps to ArtifactlsListPage component

x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts

@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
 import { TrustedAppConditionEntry } from '../types';
-import { getDuplicateFields, isValidHash } from '../service/trusted_apps/validations';
+import { getDuplicateFields, isValidHash } from '../service/artifacts/validations';
 
 export const DeleteTrustedAppsRequestSchema = {
   params: schema.object({

x-pack/plugins/security_solution/public/common/store/actions.ts

@@ -7,7 +7,6 @@
 
 import { EndpointAction } from '../../management/pages/endpoint_hosts/store/action';
 import { PolicyDetailsAction } from '../../management/pages/policy/store/policy_details';
-import { TrustedAppsPageAction } from '../../management/pages/trusted_apps/store/action';
 import { EventFiltersPageAction } from '../../management/pages/event_filters/store/action';
 
 export { appActions } from './app';
@@ -20,5 +19,4 @@ export type AppAction =
   | EndpointAction
   | RoutingAction
   | PolicyDetailsAction
-  | TrustedAppsPageAction
   | EventFiltersPageAction;

x-pack/plugins/security_solution/public/management/common/routing.test.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { extractTrustedAppsListPageLocation, getTrustedAppsListPath } from './routing';
+import type { ArtifactListPageLocation } from '../types';
+import { getTrustedAppsListPath, extractTrustedAppsListPageLocation } from './routing';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from './constants';
-import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
 
 describe('routing', () => {
   describe('extractListPaginationParams()', () => {
@@ -76,24 +76,6 @@ describe('routing', () => {
     it('extracts default "show" when single invalid value provided', () => {
       expect(extractTrustedAppsListPageLocation({ show: 'invalid' }).show).toBeUndefined();
     });
-
-    it('extracts proper view type when single valid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: 'list' }).view_type).toBe('list');
-    });
-
-    it('extracts only last view type when multiple values provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: ['grid', 'list'] }).view_type).toBe(
-        'list'
-      );
-    });
-
-    it('extracts default view type when no value provided', () => {
-      expect(extractTrustedAppsListPageLocation({}).view_type).toBe('grid');
-    });
-
-    it('extracts default view type when single invalid value provided', () => {
-      expect(extractTrustedAppsListPageLocation({ view_type: 'invalid' }).view_type).toBe('grid');
-    });
   });
 
   describe('getTrustedAppsListPath()', () => {
@@ -124,82 +106,70 @@ describe('routing', () => {
       expect(getTrustedAppsListPath({ show })).toEqual(`/administration/trusted_apps?show=${show}`);
     });
 
-    it('builds proper path when only view type provided', () => {
-      const viewType = 'list';
-      expect(getTrustedAppsListPath({ view_type: viewType })).toEqual(
-        `/administration/trusted_apps?view_type=${viewType}`
-      );
-    });
-
     it('builds proper path when all params provided', () => {
-      const location: TrustedAppsListPageLocation = {
+      const location: ArtifactListPageLocation = {
         page_index: 2,
         page_size: 20,
         show: 'create',
-        view_type: 'list',
         filter: 'test',
         included_policies: 'globally',
       };
 
       expect(getTrustedAppsListPath(location)).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&view_type=${location.view_type}&show=${location.show}&filter=${location.filter}&included_policies=${location.included_policies}`
+        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&show=${location.show}&filter=${location.filter}&included_policies=${location.included_policies}`
       );
     });
 
     it('builds proper path when page index is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
+      const location: ArtifactListPageLocation = {
         page_index: MANAGEMENT_DEFAULT_PAGE,
         page_size: 20,
         show: 'create',
-        view_type: 'list',
         filter: '',
         included_policies: '',
       };
       const path = getTrustedAppsListPath(location);
 
       expect(path).toEqual(
-        `/administration/trusted_apps?page_size=${location.page_size}&view_type=${location.view_type}&show=${location.show}`
+        `/administration/trusted_apps?page_size=${location.page_size}&show=${location.show}`
       );
     });
 
     it('builds proper path when page size is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
+      const location: ArtifactListPageLocation = {
         page_index: 2,
         page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
         show: 'create',
-        view_type: 'list',
         filter: '',
         included_policies: '',
       };
       const path = getTrustedAppsListPath(location);
 
       expect(path).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&view_type=${location.view_type}&show=${location.show}`
+        `/administration/trusted_apps?page_index=${location.page_index}&show=${location.show}`
       );
     });
 
     it('builds proper path when "show" is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
+      const location: ArtifactListPageLocation = {
         page_index: 2,
         page_size: 20,
         show: undefined,
-        view_type: 'list',
         filter: '',
         included_policies: '',
       };
       const path = getTrustedAppsListPath(location);
 
       expect(path).toEqual(
-        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}&view_type=${location.view_type}`
+        `/administration/trusted_apps?page_index=${location.page_index}&page_size=${location.page_size}`
       );
     });
 
     it('builds proper path when view type is equal to default', () => {
-      const location: TrustedAppsListPageLocation = {
+      const location: ArtifactListPageLocation = {
         page_index: 2,
         page_size: 20,
         show: 'create',
-        view_type: 'grid',
         filter: '',
         included_policies: '',
       };
@@ -215,7 +185,6 @@ describe('routing', () => {
         page_index: MANAGEMENT_DEFAULT_PAGE,
         page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
         show: undefined,
-        view_type: 'grid',
       });
 
       expect(path).toEqual('/administration/trusted_apps');

x-pack/plugins/security_solution/public/management/common/routing.ts

@@ -16,8 +16,7 @@ import { EndpointIndexUIQueryParams } from '../pages/endpoint_hosts/types';
 import { EventFiltersPageLocation } from '../pages/event_filters/types';
 import { HostIsolationExceptionsPageLocation } from '../pages/host_isolation_exceptions/types';
 import { PolicyDetailsArtifactsPageLocation } from '../pages/policy/types';
-import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
-import { AdministrationSubTab } from '../types';
+import { ArtifactListPageLocation, AdministrationSubTab } from '../types';
 import {
   MANAGEMENT_DEFAULT_PAGE,
   MANAGEMENT_DEFAULT_PAGE_SIZE,
@@ -153,9 +152,10 @@ const isDefaultOrMissing = <T>(value: T | undefined, defaultValue: T) => {
   return value === undefined || value === defaultValue;
 };
 
-const normalizeTrustedAppsPageLocation = (
-  location?: Partial<TrustedAppsListPageLocation>
-): Partial<TrustedAppsListPageLocation> => {
+// TODO: use this instead of named artifact methods below
+const normalizeArtifactsPageLocation = (
+  location?: Partial<ArtifactListPageLocation>
+): Partial<ArtifactListPageLocation> => {
   if (location) {
     return {
       ...(!isDefaultOrMissing(location.page_index, MANAGEMENT_DEFAULT_PAGE)
@@ -164,7 +164,6 @@ const normalizeTrustedAppsPageLocation = (
       ...(!isDefaultOrMissing(location.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
         ? { page_size: location.page_size }
         : {}),
-      ...(!isDefaultOrMissing(location.view_type, 'grid') ? { view_type: location.view_type } : {}),
       ...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
       ...(!isDefaultOrMissing(location.id, undefined) ? { id: location.id } : {}),
       ...(!isDefaultOrMissing(location.filter, '') ? { filter: location.filter } : ''),
@@ -317,29 +316,23 @@ export const extractArtifactsListPaginationParams = (query: querystring.ParsedUr
 
 export const extractTrustedAppsListPageLocation = (
   query: querystring.ParsedUrlQuery
-): TrustedAppsListPageLocation => {
-  const showParamValue = extractFirstParamValue(
-    query,
-    'show'
-  ) as TrustedAppsListPageLocation['show'];
+): ArtifactListPageLocation => {
+  const showParamValue = extractFirstParamValue(query, 'show') as ArtifactListPageLocation['show'];
 
   return {
     ...extractTrustedAppsListPaginationParams(query),
-    view_type: extractFirstParamValue(query, 'view_type') === 'list' ? 'list' : 'grid',
     show:
       showParamValue && ['edit', 'create'].includes(showParamValue) ? showParamValue : undefined,
     id: extractFirstParamValue(query, 'id'),
   };
 };
 
-export const getTrustedAppsListPath = (location?: Partial<TrustedAppsListPageLocation>): string => {
+export const getTrustedAppsListPath = (location?: Partial<ArtifactListPageLocation>): string => {
   const path = generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
     tabName: AdministrationSubTab.trustedApps,
   });
 
-  return `${path}${appendSearch(
-    querystring.stringify(normalizeTrustedAppsPageLocation(location))
-  )}`;
+  return `${path}${appendSearch(querystring.stringify(normalizeArtifactsPageLocation(location)))}`;
 };
 
 export const extractPolicyDetailsArtifactsListPageLocation = (

x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx

@@ -7,6 +7,7 @@
 
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { DocLinks } from '@kbn/doc-links';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   EuiButton,
@@ -33,7 +34,7 @@ import {
 } from '../types';
 import { ManagementPageLoader } from '../../management_page_loader';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
-import { useToasts } from '../../../../common/lib/kibana';
+import { useKibana, useToasts } from '../../../../common/lib/kibana';
 import { createExceptionListItemForCreate } from '../../../../../common/endpoint/service/artifacts/utils';
 import { useWithArtifactSubmitData } from '../hooks/use_with_artifact_submit_data';
 import { useIsArtifactAllowedPerPolicyUsage } from '../hooks/use_is_artifact_allowed_per_policy_usage';
@@ -96,7 +97,7 @@ export const ARTIFACT_FLYOUT_LABELS = Object.freeze({
    *   );
    * }
    */
-  flyoutDowngradedLicenseDocsInfo: (): React.ReactNode =>
+  flyoutDowngradedLicenseDocsInfo: (_: DocLinks['securitySolution']): React.ReactNode =>
     i18n.translate('xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseDocsInfo', {
       defaultMessage: 'For more information, see our documentation.',
     }),
@@ -188,6 +189,11 @@ export const ArtifactFlyout = memo<ArtifactFlyoutProps>(
     'data-test-subj': dataTestSubj,
     size = 'm',
   }) => {
+    const {
+      docLinks: {
+        links: { securitySolution },
+      },
+    } = useKibana().services;
     const getTestId = useTestIdGenerator(dataTestSubj);
     const toasts = useToasts();
     const isFlyoutOpened = useIsFlyoutOpened();
@@ -364,7 +370,8 @@ export const ArtifactFlyout = memo<ArtifactFlyoutProps>(
             iconType="help"
             data-test-subj={getTestId('expiredLicenseCallout')}
           >
-            {`${labels.flyoutDowngradedLicenseInfo} ${labels.flyoutDowngradedLicenseDocsInfo()}`}
+            {`${labels.flyoutDowngradedLicenseInfo}`}{' '}
+            {labels.flyoutDowngradedLicenseDocsInfo(securitySolution)}
           </EuiCallOut>
         )}
 

x-pack/plugins/security_solution/public/management/components/artifact_list_page/mocks.tsx

@@ -14,7 +14,7 @@ import { ArtifactFormComponentProps } from './types';
 import { ArtifactListPage, ArtifactListPageProps } from './artifact_list_page';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../common/mock/endpoint';
 import { trustedAppsAllHttpMocks } from '../../pages/mocks';
-import { TrustedAppsApiClient } from '../../pages/trusted_apps/service/trusted_apps_api_client';
+import { TrustedAppsApiClient } from '../../pages/trusted_apps/service/api_client';
 import { artifactListPageLabels } from './translations';
 
 export const getFormComponentMock = (): {

x-pack/plugins/security_solution/public/management/pages/blocklist/view/components/blocklist_form.tsx

@@ -62,7 +62,7 @@ import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
 } from '../../../../../../common/endpoint/service/artifacts/constants';
 import { useLicense } from '../../../../../common/hooks/use_license';
-import { isValidHash } from '../../../../../../common/endpoint/service/trusted_apps/validations';
+import { isValidHash } from '../../../../../../common/endpoint/service/artifacts/validations';
 import { isArtifactGlobal } from '../../../../../../common/endpoint/service/artifacts';
 import type { PolicyData } from '../../../../../../common/endpoint/types';
 import { isGlobalPolicyEffected } from '../../../../components/effected_policy_select/utils';

x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts

@@ -38,6 +38,7 @@ import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
 } from '../../../../common/endpoint/service/artifacts/constants';
+import { entriesToConditionEntries } from '../../../common/utils/exception_list_items/mappers';
 
 interface FindExceptionListItemSchemaQueryParams
   extends Omit<FindExceptionListItemSchema, 'page' | 'per_page'> {
@@ -148,6 +149,11 @@ export const trustedAppsGetOneHttpMocks =
         exceptionItem.namespace_type =
           apiQueryParams.namespace_type ?? exceptionItem.namespace_type;
 
+        // map process.hash entries to have * as suffix
+        exceptionItem.entries = entriesToConditionEntries(
+          exceptionItem.entries
+        ) as ExceptionListItemSchema['entries'];
+
         return exceptionItem;
       },
     },

x-pack/plugins/security_solution/public/management/pages/policy/test_utils/mocks.ts

@@ -5,8 +5,61 @@
  * 2.0.
  */
 
-import { GetTrustedAppsListResponse } from '../../../../../common/endpoint/types';
-import { createSampleTrustedApps } from '../../trusted_apps/test_utils';
+import { OperatingSystem } from '@kbn/securitysolution-utils';
+import { GetTrustedAppsListResponse, TrustedApp } from '../../../../../common/endpoint/types';
+import {
+  MANAGEMENT_DEFAULT_PAGE,
+  MANAGEMENT_DEFAULT_PAGE_SIZE,
+  MANAGEMENT_PAGE_SIZE_OPTIONS,
+} from '../../../common/constants';
+
+interface Pagination {
+  pageIndex: number;
+  pageSize: number;
+  totalItemCount: number;
+  pageSizeOptions: number[];
+}
+
+const OPERATING_SYSTEMS: OperatingSystem[] = [
+  OperatingSystem.WINDOWS,
+  OperatingSystem.MAC,
+  OperatingSystem.LINUX,
+];
+
+const generate = <T>(count: number, generator: (i: number) => T) =>
+  [...new Array(count).keys()].map(generator);
+
+const createSampleTrustedApp = (i: number, longTexts?: boolean): TrustedApp => {
+  return {
+    id: String(i),
+    version: 'abc123',
+    name: generate(longTexts ? 10 : 1, () => `trusted app ${i}`).join(' '),
+    description: generate(longTexts ? 10 : 1, () => `Trusted App ${i}`).join(' '),
+    created_at: '1 minute ago',
+    created_by: 'someone',
+    updated_at: '1 minute ago',
+    updated_by: 'someone',
+    os: OPERATING_SYSTEMS[i % 3],
+    entries: [],
+    effectScope: { type: 'global' },
+  };
+};
+
+const createDefaultPagination = (): Pagination => ({
+  pageIndex: MANAGEMENT_DEFAULT_PAGE,
+  pageSize: MANAGEMENT_DEFAULT_PAGE_SIZE,
+  totalItemCount: 200,
+  pageSizeOptions: [...MANAGEMENT_PAGE_SIZE_OPTIONS],
+});
+
+const createSampleTrustedApps = (
+  pagination: Partial<Pagination>,
+  longTexts?: boolean
+): TrustedApp[] => {
+  const fullPagination = { ...createDefaultPagination(), ...pagination };
+
+  return generate(fullPagination.pageSize, (i: number) => createSampleTrustedApp(i, longTexts));
+};
 
 export const getMockListResponse: () => GetTrustedAppsListResponse = () => ({
   data: createSampleTrustedApps({}),

x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/empty/policy_artifacts_empty_unassigned.tsx

@@ -12,7 +12,7 @@ import { useGetLinkTo } from './use_policy_artifacts_empty_hooks';
 import { useUserPrivileges } from '../../../../../../common/components/user_privileges';
 import { POLICY_ARTIFACT_EMPTY_UNASSIGNED_LABELS } from './translations';
 import { EventFiltersPageLocation } from '../../../../event_filters/types';
-import { TrustedAppsListPageLocation } from '../../../../trusted_apps/state';
+import type { ArtifactListPageLocation } from '../../../../../types';
 import { HostIsolationExceptionsPageLocation } from '../../../../host_isolation_exceptions/types';
 interface CommonProps {
   policyId: string;
@@ -23,7 +23,7 @@ interface CommonProps {
   getArtifactPath: (
     location?:
       | Partial<EventFiltersPageLocation>
-      | Partial<TrustedAppsListPageLocation>
+      | Partial<ArtifactListPageLocation>
       | Partial<HostIsolationExceptionsPageLocation>
   ) => string;
 }