Tweak cursor handling in the routes

elastic · Jan 2, 2020 · c5e231a · c5e231a
1 parent c454479
commit c5e231a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/entries.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/entries.ts
@@ -20,6 +20,7 @@ import {
   logEntriesResponseRT,
 } from '../../../common/http_api/log_entries';
 import { parseFilterQuery } from '../../utils/serialized_query';
+import { LogEntriesParams } from '../../lib/domains/log_entries_domain';
 
 const escapeHatch = schema.object({}, { allowUnknowns: true });
 
@@ -39,13 +40,6 @@ export const initLogEntriesRoute = ({ framework, logEntries }: InfraBackendLibs)
 
         const { startDate, endDate, sourceId, query, size } = payload;
 
-        let cursor;
-        if ('before' in payload) {
-          cursor = { before: payload.before };
-        } else if ('after' in payload) {
-          cursor = { after: payload.after };
-        }
-
         let entries;
         if ('center' in payload) {
           entries = await logEntries.getLogEntriesAround__new(requestContext, sourceId, {
@@ -56,6 +50,13 @@ export const initLogEntriesRoute = ({ framework, logEntries }: InfraBackendLibs)
             size,
           });
         } else {
+          let cursor: LogEntriesParams['cursor'];
+          if ('before' in payload) {
+            cursor = { before: payload.before };
+          } else if ('after' in payload) {
+            cursor = { after: payload.after };
+          }
+
           entries = await logEntries.getLogEntries(requestContext, sourceId, {
             startDate,
             endDate,

diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/highlights.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/highlights.ts
@@ -20,6 +20,7 @@ import {
   logEntriesHighlightsResponseRT,
 } from '../../../common/http_api/log_entries';
 import { parseFilterQuery } from '../../utils/serialized_query';
+import { LogEntriesParams } from '../../lib/domains/log_entries_domain';
 
 const escapeHatch = schema.object({}, { allowUnknowns: true });
 
@@ -55,7 +56,7 @@ export const initLogEntriesHighlightsRoute = ({ framework, logEntries }: InfraBa
             )
           );
         } else {
-          let cursor;
+          let cursor: LogEntriesParams['cursor'];
           if ('before' in payload) {
             cursor = { before: payload.before };
           } else if ('after' in payload) {