Btsymbala/trusted app deletion

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

@@ -6,10 +6,14 @@
 
 import { TypeOf } from '@kbn/config-schema';
 import {
+  DeleteTrustedAppsRequestSchema,
   GetTrustedAppsRequestSchema,
   PostTrustedAppCreateRequestSchema,
 } from '../schema/trusted_apps';
 
+/** API request params for deleting Trusted App entry */
+export type DeleteTrustedAppsRequestParams = TypeOf<typeof DeleteTrustedAppsRequestSchema.params>;
+
 /** API request params for retrieving a list of Trusted Apps */
 export type GetTrustedAppsListRequest = TypeOf<typeof GetTrustedAppsRequestSchema.query>;
 export interface GetTrustedListAppsResponse {

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

@@ -90,10 +90,7 @@ export const getPolicyDetailPath = (policyId: string, search?: string) => {
   })}${appendSearch(search)}`;
 };
 
-const isDefaultOrMissing = (
-  value: number | string | undefined,
-  defaultValue: number | undefined
-) => {
+const isDefaultOrMissing = <T>(value: T | undefined, defaultValue: T) => {
   return value === undefined || value === defaultValue;
 };
 

x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/index.ts

@@ -5,19 +5,26 @@
  */
 
 import { HttpStart } from 'kibana/public';
+
 import {
   TRUSTED_APPS_CREATE_API,
+  TRUSTED_APPS_DELETE_API,
   TRUSTED_APPS_LIST_API,
 } from '../../../../../common/endpoint/constants';
+
 import {
+  DeleteTrustedAppsRequestParams,
   GetTrustedListAppsResponse,
   GetTrustedAppsListRequest,
   PostTrustedAppCreateRequest,
   PostTrustedAppCreateResponse,
 } from '../../../../../common/endpoint/types/trusted_apps';
 
+import { resolvePathVariables } from './utils';
+
 export interface TrustedAppsService {
   getTrustedAppsList(request: GetTrustedAppsListRequest): Promise<GetTrustedListAppsResponse>;
+  deleteTrustedApp(request: DeleteTrustedAppsRequestParams): Promise<void>;
   createTrustedApp(request: PostTrustedAppCreateRequest): Promise<PostTrustedAppCreateResponse>;
 }
 
@@ -30,6 +37,10 @@ export class TrustedAppsHttpService implements TrustedAppsService {
     });
   }
 
+  async deleteTrustedApp(request: DeleteTrustedAppsRequestParams): Promise<void> {
+    return this.http.delete<void>(resolvePathVariables(TRUSTED_APPS_DELETE_API, request));
+  }
+
   async createTrustedApp(request: PostTrustedAppCreateRequest) {
     return this.http.post<PostTrustedAppCreateResponse>(TRUSTED_APPS_CREATE_API, {
       body: JSON.stringify(request),

x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.test.ts

@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resolvePathVariables } from './utils';
+
+describe('utils', () => {
+  describe('resolvePathVariables', () => {
+    it('should resolve defined variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', { var1: 'value1' })).toBe(
+        '/segment1/value1/segment2'
+      );
+    });
+
+    it('should not resolve undefined variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', {})).toBe(
+        '/segment1/{var1}/segment2'
+      );
+    });
+
+    it('should ignore unused variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', { var2: 'value2' })).toBe(
+        '/segment1/{var1}/segment2'
+      );
+    });
+
+    it('should replace multiple variable occurences', () => {
+      expect(resolvePathVariables('/{var1}/segment1/{var1}', { var1: 'value1' })).toBe(
+        '/value1/segment1/value1'
+      );
+    });
+
+    it('should replace multiple variables', () => {
+      const path = resolvePathVariables('/{var1}/segment1/{var2}', {
+        var1: 'value1',
+        var2: 'value2',
+      });
+
+      expect(path).toBe('/value1/segment1/value2');
+    });
+  });
+});

x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const resolvePathVariables = (path: string, variables: { [K: string]: string | number }) =>
+  Object.keys(variables).reduce((acc, paramName) => {
+    return acc.replace(new RegExp(`\{${paramName}\}`, 'g'), String(variables[paramName]));
+  }, path);

x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/async_resource_state.test.ts

@@ -13,6 +13,7 @@ import {
   isLoadingResourceState,
   isLoadedResourceState,
   isFailedResourceState,
+  isStaleResourceState,
   getLastLoadedResourceState,
   getCurrentResourceError,
   isOutdatedResourceState,
@@ -137,6 +138,24 @@ describe('AsyncResourceState', () => {
         expect(isFailedResourceState(failedResourceStateInitially)).toBe(true);
       });
     });
+
+    describe('isStaleResourceState()', () => {
+      it('returns true for UninitialisedResourceState', () => {
+        expect(isStaleResourceState(uninitialisedResourceState)).toBe(true);
+      });
+
+      it('returns false for LoadingResourceState', () => {
+        expect(isStaleResourceState(loadingResourceStateInitially)).toBe(false);
+      });
+
+      it('returns true for LoadedResourceState', () => {
+        expect(isStaleResourceState(loadedResourceState)).toBe(true);
+      });
+
+      it('returns true for FailedResourceState', () => {
+        expect(isStaleResourceState(failedResourceStateInitially)).toBe(true);
+      });
+    });
   });
 
   describe('functions', () => {

x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/async_resource_state.ts

@@ -35,7 +35,7 @@ export interface UninitialisedResourceState {
  * @param Data - type of the data that is referenced by resource state
  * @param Error - type of the error that can happen during attempt to update data
  */
-export interface LoadingResourceState<Data, Error = ServerApiError> {
+export interface LoadingResourceState<Data = null, Error = ServerApiError> {
   type: 'LoadingResourceState';
   previousState: StaleResourceState<Data, Error>;
 }
@@ -46,7 +46,7 @@ export interface LoadingResourceState<Data, Error = ServerApiError> {
  *
  * @param Data - type of the data that is referenced by resource state
  */
-export interface LoadedResourceState<Data> {
+export interface LoadedResourceState<Data = null> {
   type: 'LoadedResourceState';
   data: Data;
 }
@@ -59,7 +59,7 @@ export interface LoadedResourceState<Data> {
  * @param Data - type of the data that is referenced by resource state
  * @param Error - type of the error that can happen during attempt to update data
  */
-export interface FailedResourceState<Data, Error = ServerApiError> {
+export interface FailedResourceState<Data = null, Error = ServerApiError> {
   type: 'FailedResourceState';
   error: Error;
   lastLoadedState?: LoadedResourceState<Data>;
@@ -71,7 +71,7 @@ export interface FailedResourceState<Data, Error = ServerApiError> {
  * @param Data - type of the data that is referenced by resource state
  * @param Error - type of the error that can happen during attempt to update data
  */
-export type StaleResourceState<Data, Error = ServerApiError> =
+export type StaleResourceState<Data = null, Error = ServerApiError> =
   | UninitialisedResourceState
   | LoadedResourceState<Data>
   | FailedResourceState<Data, Error>;
@@ -82,7 +82,7 @@ export type StaleResourceState<Data, Error = ServerApiError> =
  * @param Data - type of the data that is referenced by resource state
  * @param Error - type of the error that can happen during attempt to update data
  */
-export type AsyncResourceState<Data, Error = ServerApiError> =
+export type AsyncResourceState<Data = null, Error = ServerApiError> =
   | UninitialisedResourceState
   | LoadingResourceState<Data, Error>
   | LoadedResourceState<Data>
@@ -106,6 +106,13 @@ export const isFailedResourceState = <Data, Error>(
   state: Immutable<AsyncResourceState<Data, Error>>
 ): state is Immutable<FailedResourceState<Data, Error>> => state.type === 'FailedResourceState';
 
+export const isStaleResourceState = <Data, Error>(
+  state: Immutable<AsyncResourceState<Data, Error>>
+): state is Immutable<StaleResourceState<Data, Error>> =>
+  isUninitialisedResourceState(state) ||
+  isLoadedResourceState(state) ||
+  isFailedResourceState(state);
+
 // Set of functions to work with AsyncResourceState
 
 export const getLastLoadedResourceState = <Data, Error>(

x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ServerApiError } from '../../../../common/types';
 import { NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types/trusted_apps';
 import { AsyncResourceState } from '.';
 import { TrustedAppsUrlParams } from '../types';
-import { ServerApiError } from '../../../../common/types';
 
 export interface PaginationInfo {
   index: number;
@@ -18,6 +18,7 @@ export interface TrustedAppsListData {
   items: TrustedApp[];
   totalItemsCount: number;
   paginationInfo: PaginationInfo;
+  timestamp: number;
 }
 
 /** Store State when an API request has been sent to create a new trusted app entry */
@@ -42,8 +43,14 @@ export interface TrustedAppsListPageState {
   listView: {
     currentListResourceState: AsyncResourceState<TrustedAppsListData>;
     currentPaginationInfo: PaginationInfo;
+    freshDataTimestamp: number;
     show: TrustedAppsUrlParams['show'] | undefined;
   };
+  deletionDialog: {
+    entry?: TrustedApp;
+    confirmed: boolean;
+    submissionResourceState: AsyncResourceState;
+  };
   createView:
     | undefined
     | TrustedAppCreatePending

x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/action.ts

@@ -4,6 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Action } from 'redux';
+
+import { TrustedApp } from '../../../../../common/endpoint/types';
 import {
   AsyncResourceState,
   TrustedAppCreateFailure,
@@ -12,12 +15,30 @@ import {
   TrustedAppsListData,
 } from '../state';
 
-export interface TrustedAppsListResourceStateChanged {
-  type: 'trustedAppsListResourceStateChanged';
+export type TrustedAppsListDataOutdated = Action<'trustedAppsListDataOutdated'>;
+
+interface ResourceStateChanged<T, D = null> extends Action<T> {
+  payload: { newState: AsyncResourceState<D> };
+}
+
+export type TrustedAppsListResourceStateChanged = ResourceStateChanged<
+  'trustedAppsListResourceStateChanged',
+  TrustedAppsListData
+>;
+
+export type TrustedAppDeletionSubmissionResourceStateChanged = ResourceStateChanged<
+  'trustedAppDeletionSubmissionResourceStateChanged'
+>;
+
+export type TrustedAppDeletionDialogStarted = Action<'trustedAppDeletionDialogStarted'> & {
   payload: {
-    newState: AsyncResourceState<TrustedAppsListData>;
+    entry: TrustedApp;
   };
-}
+};
+
+export type TrustedAppDeletionDialogConfirmed = Action<'trustedAppDeletionDialogConfirmed'>;
+
+export type TrustedAppDeletionDialogClosed = Action<'trustedAppDeletionDialogClosed'>;
 
 export interface UserClickedSaveNewTrustedAppButton {
   type: 'userClickedSaveNewTrustedAppButton';
@@ -35,7 +56,12 @@ export interface ServerReturnedCreateTrustedAppFailure {
 }
 
 export type TrustedAppsPageAction =
+  | TrustedAppsListDataOutdated
   | TrustedAppsListResourceStateChanged
+  | TrustedAppDeletionSubmissionResourceStateChanged
+  | TrustedAppDeletionDialogStarted
+  | TrustedAppDeletionDialogConfirmed
+  | TrustedAppDeletionDialogClosed
   | UserClickedSaveNewTrustedAppButton
   | ServerReturnedCreateTrustedAppSuccess
   | ServerReturnedCreateTrustedAppFailure;