Fix types after merge

elastic · Feb 1, 2021 · 05669db · 05669db
1 parent 290371d
commit 05669db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts b/x-pack/plugins/infra/common/search_strategies/log_entries/log_entries.ts
@@ -5,14 +5,15 @@
  */
 
 import * as rt from 'io-ts';
+import { DslQuery } from '../../../../../../src/plugins/data/common';
 import { logSourceColumnConfigurationRT } from '../../http_api/log_sources';
 import {
   logEntryAfterCursorRT,
   logEntryBeforeCursorRT,
   logEntryCursorRT,
   logEntryRT,
 } from '../../log_entry';
-import { jsonObjectRT } from '../../typed_json';
+import { JsonObject, jsonObjectRT } from '../../typed_json';
 import { searchStrategyErrorRT } from '../common/errors';
 
 export const LOG_ENTRIES_SEARCH_STRATEGY = 'infra-log-entries';
@@ -49,6 +50,8 @@ export const logEntriesSearchRequestParamsRT = rt.union([
 
 export type LogEntriesSearchRequestParams = rt.TypeOf<typeof logEntriesSearchRequestParamsRT>;
 
+export type LogEntriesSearchRequestQuery = JsonObject | DslQuery;
+
 export const logEntriesSearchResponsePayloadRT = rt.intersection([
   rt.type({
     data: rt.intersection([

diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
@@ -13,11 +13,11 @@ import { LogEntryAfterCursor } from '../../../../common/log_entry';
 import { decodeOrThrow } from '../../../../common/runtime_types';
 import {
   logEntriesSearchRequestParamsRT,
+  LogEntriesSearchRequestQuery,
   LogEntriesSearchResponsePayload,
   logEntriesSearchResponsePayloadRT,
   LOG_ENTRIES_SEARCH_STRATEGY,
 } from '../../../../common/search_strategies/log_entries/log_entries';
-import { JsonObject } from '../../../../common/typed_json';
 import {
   flattenDataSearchResponseDescriptor,
   normalizeDataSearchResponses,
@@ -38,7 +38,7 @@ export const useLogEntriesAfterRequest = ({
   columnOverrides?: LogSourceColumnConfiguration[];
   endTimestamp: number;
   highlightPhrase?: string;
-  query?: JsonObject;
+  query?: LogEntriesSearchRequestQuery;
   sourceId: string;
   startTimestamp: number;
 }) => {
@@ -116,7 +116,7 @@ export const useFetchLogEntriesAfter = ({
   columnOverrides?: LogSourceColumnConfiguration[];
   endTimestamp: number;
   highlightPhrase?: string;
-  query?: JsonObject;
+  query?: LogEntriesSearchRequestQuery;
   sourceId: string;
   startTimestamp: number;
 }) => {

diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_around.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_around.ts
@@ -9,7 +9,7 @@ import { combineLatest, Observable, Subject } from 'rxjs';
 import { last, map, startWith, switchMap } from 'rxjs/operators';
 import { LogSourceColumnConfiguration } from '../../../../common/http_api/log_sources';
 import { LogEntryCursor } from '../../../../common/log_entry';
-import { JsonObject } from '../../../../common/typed_json';
+import { LogEntriesSearchRequestQuery } from '../../../../common/search_strategies/log_entries/log_entries';
 import { flattenDataSearchResponseDescriptor } from '../../../utils/data_search';
 import { useObservable, useObservableState } from '../../../utils/use_observable';
 import { useLogEntriesAfterRequest } from './use_fetch_log_entries_after';
@@ -26,7 +26,7 @@ export const useFetchLogEntriesAround = ({
   columnOverrides?: LogSourceColumnConfiguration[];
   endTimestamp: number;
   highlightPhrase?: string;
-  query?: JsonObject;
+  query?: LogEntriesSearchRequestQuery;
   sourceId: string;
   startTimestamp: number;
 }) => {

diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
@@ -13,11 +13,11 @@ import { LogEntryBeforeCursor } from '../../../../common/log_entry';
 import { decodeOrThrow } from '../../../../common/runtime_types';
 import {
   logEntriesSearchRequestParamsRT,
+  LogEntriesSearchRequestQuery,
   LogEntriesSearchResponsePayload,
   logEntriesSearchResponsePayloadRT,
   LOG_ENTRIES_SEARCH_STRATEGY,
 } from '../../../../common/search_strategies/log_entries/log_entries';
-import { JsonObject } from '../../../../common/typed_json';
 import {
   flattenDataSearchResponseDescriptor,
   normalizeDataSearchResponses,
@@ -38,7 +38,7 @@ export const useLogEntriesBeforeRequest = ({
   columnOverrides?: LogSourceColumnConfiguration[];
   endTimestamp: number;
   highlightPhrase?: string;
-  query?: JsonObject;
+  query?: LogEntriesSearchRequestQuery;
   sourceId: string;
   startTimestamp: number;
 }) => {
@@ -117,7 +117,7 @@ export const useFetchLogEntriesBefore = ({
   columnOverrides?: LogSourceColumnConfiguration[];
   endTimestamp: number;
   highlightPhrase?: string;
-  query?: JsonObject;
+  query?: LogEntriesSearchRequestQuery;
   sourceId: string;
   startTimestamp: number;
 }) => {