SortField

elastic · Aug 31, 2020 · 8d59de5 · 8d59de5
1 parent b2101f5
commit 8d59de5
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 34 deletions.
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts
@@ -14,7 +14,6 @@ import {
  Maybe,
  PageInfoPaginated,
  RequestOptionsPaginated,
- SortField,
  TimerangeInput,
 } from '..';
 
@@ -29,6 +28,11 @@ export enum HostPolicyResponseActionStatus {
  warning = 'warning',
 }
 
+export enum HostsFields {
+ lastSeen = 'lastSeen',
+ hostName = 'hostName',
+}
+
 export interface EndpointFields {
  endpointPolicy?: Maybe<string>;
 
@@ -69,12 +73,12 @@ export interface HostOverviewStrategyResponse extends IEsSearchResponse, HostIte
  inspect?: Maybe<Inspect>;
 }
 
-export interface HostsRequestOptions extends RequestOptionsPaginated {
- sort: SortField;
+export interface HostsRequestOptions extends RequestOptionsPaginated<HostsFields> {
  defaultIndex: string[];
 }
 
-export interface HostLastFirstSeenRequestOptions extends Partial<RequestOptionsPaginated> {
+export interface HostLastFirstSeenRequestOptions
+ extends Partial<RequestOptionsPaginated<HostsFields>> {
  hostName: string;
 }
 

diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -16,6 +16,7 @@ import {
 import { NetworkQueries, NetworkTlsStrategyResponse, NetworkTlsRequestOptions } from './network';
 
 export * from './hosts';
+export * from './network';
 export type Maybe<T> = T | null;
 
 export type FactoryQueryTypes = HostsQueries | NetworkQueries;
@@ -41,8 +42,8 @@ export enum Direction {
  desc = 'desc',
 }
 
-export interface SortField {
- field: 'lastSeen' | 'hostName';
+export interface SortField<Field = string> {
+ field: Field;
  direction: Direction;
 }
 
@@ -88,14 +89,14 @@ export interface RequestBasicOptions extends IEsSearchRequest {
  factoryQueryType?: FactoryQueryTypes;
 }
 
-export interface RequestOptions extends RequestBasicOptions {
+export interface RequestOptions<Field = string> extends RequestBasicOptions {
  pagination: PaginationInput;
- sortField?: SortField;
+ sort: SortField<Field>;
 }
 
-export interface RequestOptionsPaginated extends RequestBasicOptions {
+export interface RequestOptionsPaginated<Field = string> extends RequestBasicOptions {
  pagination: PaginationInputPaginated;
- sortField?: SortField;
+ sort: SortField<Field>;
 }
 
 export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQueries.hosts

diff --git a/...strategy/security_solution/network/tls.ts → ...gy/security_solution/network/tls/index.ts b/...strategy/security_solution/network/tls.ts → ...gy/security_solution/network/tls/index.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
-import { CursorType, Inspect, Maybe, PageInfoPaginated, RequestOptionsPaginated } from '..';
+import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { CursorType, Inspect, Maybe, PageInfoPaginated, RequestOptionsPaginated } from '../..';
 
 export interface TlsBuckets {
  key: string;
@@ -50,20 +50,9 @@ export interface TlsEdges {
  cursor: CursorType;
 }
 
-export enum Direction {
- asc = 'asc',
- desc = 'desc',
-}
-
-export interface TlsSortField {
- field: TlsFields;
- direction: Direction;
-}
-
-export interface NetworkTlsRequestOptions extends RequestOptionsPaginated {
+export interface NetworkTlsRequestOptions extends RequestOptionsPaginated<TlsFields> {
  ip: string;
  flowTarget: FlowTargetSourceDest;
- sort: TlsSortField;
  defaultIndex: string[];
 }
 

diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -168,10 +168,6 @@ export const useNetworkTls = ({
  );
 
  useEffect(() => {
- if (skip) {
- return;
- }
-
  setHostRequest((prevRequest) => {
  const myRequest = {
  ...prevRequest,
@@ -185,7 +181,7 @@ export const useNetworkTls = ({
  },
  sort,
  };
- if (!deepEqual(prevRequest, myRequest)) {
+ if (!skip && !deepEqual(prevRequest, myRequest)) {
  return myRequest;
  }
  return prevRequest;

diff --git a/...ty_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts b/...ty_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts
@@ -10,8 +10,10 @@ import {
  Direction,
  HostsRequestOptions,
  SortField,
+ HostsFields,
 } from '../../../../../../common/search_strategy/security_solution';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
+import { assertUnreachable } from '../../../../../../common/utility_types';
 
 export const buildHostsQuery = ({
  defaultIndex,
@@ -77,11 +79,13 @@ export const buildHostsQuery = ({
 
 type QueryOrder = { lastSeen: Direction } | { _key: Direction };
 
-const getQueryOrder = (sort: SortField): QueryOrder => {
+const getQueryOrder = (sort: SortField<HostsFields>): QueryOrder => {
  switch (sort.field) {
  case 'lastSeen':
  return { lastSeen: sort.direction };
  case 'hostName':
  return { _key: sort.direction };
+ default:
+ return assertUnreachable(sort.field as never);
  }
 };
diff --git a/...ion/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.ts b/...ion/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.ts
@@ -7,10 +7,14 @@
 import { assertUnreachable } from '../../../../../../common/utility_types';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
 
-import { NetworkTlsRequestOptions } from '../../../../../../common/search_strategy/security_solution/network';
-import { TlsSortField, Direction, TlsFields } from '../../../../../graphql/types';
+import {
+ NetworkTlsRequestOptions,
+ SortField,
+ Direction,
+ TlsFields,
+} from '../../../../../../common/search_strategy/security_solution';
 
-const getAggs = (querySize: number, sort: TlsSortField) => ({
+const getAggs = (querySize: number, sort: SortField<TlsFields>) => ({
  count: {
  cardinality: {
  field: 'tls.server.hash.sha1',
@@ -94,7 +98,7 @@ interface QueryOrder {
  _key: Direction;
 }
 
-const getQueryOrder = (sort: TlsSortField): QueryOrder => {
+const getQueryOrder = (sort: SortField<TlsFields>): QueryOrder => {
  switch (sort.field) {
  case TlsFields._id:
  return { _key: sort.direction };